diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index 754d31a99b2dcaa75b89d2322ac19955f3a13b4b..110c15b6336a1f9f5e4ce947eb5c740623742c0e 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -331,7 +331,6 @@ Layout/LineLength: - 'app/models/integrations/asana.rb' - 'app/models/integrations/base_chat_notification.rb' - 'app/models/integrations/base_issue_tracker.rb' - - 'app/models/integrations/bugzilla.rb' - 'app/models/integrations/chat_message/merge_message.rb' - 'app/models/integrations/chat_message/note_message.rb' - 'app/models/integrations/chat_message/pipeline_message.rb' diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml index 7ff9f8b091f7bd0e2d3f7e59982bc1969f86f1c3..1c0bcb1ccc1bbdd52662b7bdbde43e45007f5b24 100644 --- a/.rubocop_todo/rspec/feature_category.yml +++ b/.rubocop_todo/rspec/feature_category.yml @@ -4453,7 +4453,6 @@ RSpec/FeatureCategory: - 'spec/models/integrations/base_issue_tracker_spec.rb' - 'spec/models/integrations/base_slack_notification_spec.rb' - 'spec/models/integrations/base_third_party_wiki_spec.rb' - - 'spec/models/integrations/bugzilla_spec.rb' - 'spec/models/integrations/buildkite_spec.rb' - 'spec/models/integrations/chat_message/alert_message_spec.rb' - 'spec/models/integrations/chat_message/base_message_spec.rb' diff --git a/.rubocop_todo/style/format_string.yml b/.rubocop_todo/style/format_string.yml index b4f4dbf4717a9cb82ca00128b96a5c1bffd0c830..59674f796875cd88f194498f828b7d976bdbb6a7 100644 --- a/.rubocop_todo/style/format_string.yml +++ b/.rubocop_todo/style/format_string.yml @@ -77,7 +77,6 @@ Style/FormatString: - 'app/models/diff_note.rb' - 'app/models/diff_viewer/base.rb' - 'app/models/integrations/asana.rb' - - 'app/models/integrations/bugzilla.rb' - 'app/models/integrations/chat_message/pipeline_message.rb' - 'app/models/integrations/confluence.rb' - 'app/models/integrations/custom_issue_tracker.rb' diff --git a/app/models/integrations/bugzilla.rb b/app/models/integrations/bugzilla.rb index cdb27c91a272e8d2e3e975b89b7ed74bdfcfc8ed..07f5ab5b2b11dc345f631c27ae4767d66e1bd976 100644 --- a/app/models/integrations/bugzilla.rb +++ b/app/models/integrations/bugzilla.rb @@ -16,12 +16,22 @@ def self.description end def self.help - docs_link = ActionController::Base.helpers.link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/bugzilla'), target: '_blank', rel: 'noopener noreferrer' - s_("IssueTracker|Use Bugzilla as this project's issue tracker. %{docs_link}").html_safe % { docs_link: docs_link.html_safe } + docs_link = ActionController::Base.helpers.link_to(_('Learn more.'), + Rails.application.routes.url_helpers.help_page_url('user/project/integrations/bugzilla'), + target: '_blank', + rel: 'noopener noreferrer') + + help = format(s_("IssueTracker|Use Bugzilla as this project's issue tracker. %{docs_link}").html_safe, + docs_link: docs_link.html_safe) + help << "<br><br><i>#{attribution_notice}</i>".html_safe end def self.to_param 'bugzilla' end + + def self.attribution_notice + _('The Bugzilla logo is a trademark of the Mozilla Foundation in the U.S. and other countries.') + end end end diff --git a/locale/gitlab.pot b/locale/gitlab.pot index f16c014d82431c0046c6146419ecd1eaaa267556..1133b97550e09b445f720deaf8c7dd0242ddb93d 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -49513,6 +49513,9 @@ msgstr[1] "" msgid "The API key used by GitLab for accessing the Spam Check service endpoint." msgstr "" +msgid "The Bugzilla logo is a trademark of the Mozilla Foundation in the U.S. and other countries." +msgstr "" + msgid "The CSV export will be created in the background. Once finished, it will be sent to %{email} in an attachment." msgstr "" diff --git a/spec/models/integrations/bugzilla_spec.rb b/spec/models/integrations/bugzilla_spec.rb index 60d28251cff8018c8c492f9cd8c5a14796cd7ec8..4102eef7dc9a94f44b8bc230b1cfee9a634fa290 100644 --- a/spec/models/integrations/bugzilla_spec.rb +++ b/spec/models/integrations/bugzilla_spec.rb @@ -30,4 +30,11 @@ it { is_expected.not_to validate_presence_of(:new_issue_url) } end end + + describe '.attribution_notice' do + it do + expect(described_class.attribution_notice) + .to eq('The Bugzilla logo is a trademark of the Mozilla Foundation in the U.S. and other countries.') + end + end end