Merge branch '330300-cleanup' into 'master'

Clean up temporary code

See merge request gitlab-org/gitlab!65769

app/controllers/projects/mattermosts_controller.rb

@@ -41,6 +41,5 @@ class Projects::MattermostsController < Projects::ApplicationController
 
   def integration
     @integration ||= @project.find_or_initialize_integration('mattermost_slash_commands')
-    @service = @integration # TODO: remove when https://gitlab.com/gitlab-org/gitlab/-/issues/330300 is complete
   end
 end

app/controllers/projects/service_hook_logs_controller.rb

@@ -16,6 +16,5 @@ class Projects::ServiceHookLogsController < Projects::HookLogsController
 
   def integration
     @integration ||= @project.find_or_initialize_integration(params[:service_id])
-    @service = @integration # TODO: remove when https://gitlab.com/gitlab-org/gitlab/-/issues/330300 is complete
   end
 end

app/controllers/projects/services_controller.rb

@@ -112,7 +112,7 @@ class Projects::ServicesController < Projects::ApplicationController
     return if !integration.is_a?(::Integrations::Prometheus) || !Feature.enabled?(:settings_operations_prometheus_service, project)
 
     operations_link_start = "<a href=\"#{project_settings_operations_path(project)}\">"
-    message = s_('PrometheusService|You can now manage your Prometheus settings on the %{operations_link_start}Operations%{operations_link_end} page. Fields on this page has been deprecated.') % { operations_link_start: operations_link_start, operations_link_end: "</a>" }
+    message = s_('PrometheusService|You can now manage your Prometheus settings on the %{operations_link_start}Operations%{operations_link_end} page. Fields on this page have been deprecated.') % { operations_link_start: operations_link_start, operations_link_end: "</a>" }
     flash.now[:alert] = message.html_safe
   end
 end

app/views/projects/mattermosts/_no_teams.html.haml

@@ -15,4 +15,4 @@
   and try again.
 %hr
 .clearfix
-  = link_to 'Go back', edit_project_service_path(@project, @service), class: 'gl-button btn btn-lg float-right'
+  = link_to 'Go back', edit_project_service_path(@project, @integration), class: 'gl-button btn btn-lg float-right'

app/views/projects/mattermosts/_team_selection.html.haml

@@ -2,7 +2,7 @@
   This service will be installed on the Mattermost instance at
   %strong= link_to Gitlab.config.mattermost.host, Gitlab.config.mattermost.host
 %hr
-= form_for(:mattermost, method: :post, url: project_mattermost_path(@project), html: { class: 'js-requires-input'} ) do |f|
+= form_for(:mattermost, method: :post, url: project_mattermost_path(@project), html: { class: 'js-requires-input' }) do |f|
   %h4 Team
   %p
     = @teams.one? ? 'The team' : 'Select the team'
@@ -42,5 +42,5 @@
   %hr
   .clearfix
     .float-right
-      = link_to 'Cancel', edit_project_service_path(@project, @service), class: 'gl-button btn btn-lg'
+      = link_to 'Cancel', edit_project_service_path(@project, @integration), class: 'gl-button btn btn-lg'
       = f.submit 'Install', class: 'gl-button btn btn-success btn-lg'

locale/gitlab.pot

@@ -26414,7 +26414,7 @@ msgstr ""
 msgid "PrometheusService|Waiting for your first deployment to an environment to find common metrics"
 msgstr ""
 
-msgid "PrometheusService|You can now manage your Prometheus settings on the %{operations_link_start}Operations%{operations_link_end} page. Fields on this page has been deprecated."
+msgid "PrometheusService|You can now manage your Prometheus settings on the %{operations_link_start}Operations%{operations_link_end} page. Fields on this page have been deprecated."
 msgstr ""
 
 msgid "PrometheusService|You have a cluster with the Prometheus integration enabled."

spec/features/projects/services/user_activates_prometheus_spec.rb

@@ -17,6 +17,6 @@ RSpec.describe 'User activates Prometheus' do
     click_button('Save changes')
 
     expect(page).not_to have_content('Prometheus settings saved and active.')
-    expect(page).to have_content('Fields on this page has been deprecated.')
+    expect(page).to have_content('Fields on this page have been deprecated.')
   end
 end

spec/lib/banzai/filter/references/external_issue_reference_filter_spec.rb

@@ -217,8 +217,6 @@ RSpec.describe Banzai::Filter::References::ExternalIssueReferenceFilter do
   context "ewm project" do
     let_it_be(:integration) { create(:ewm_integration, project: project) }
 
-    let(:service) { integration } # TODO: remove when https://gitlab.com/gitlab-org/gitlab/-/issues/330300 is complete
-
     before do
       project.update!(issues_enabled: false)
     end