Merge branch '56052-fix-failing-operations-settings-tests' into 'master'

Mock error_tracking_setting to fix tests on failing master

See merge request gitlab-org/gitlab-ee!9062

ee/spec/views/projects/settings/operations/show.html.haml_spec.rb

@@ -4,11 +4,13 @@ require 'spec_helper'
 
 describe 'projects/settings/operations/show' do
   let(:project) { create(:project, :repository) }
+  let(:error_tracking_setting) { create(:project_error_tracking_setting, project: project) }
 
   before do
     assign(:project, project)
     assign(:repository, project.repository)
     allow(view).to receive(:current_ref).and_return('master')
+    allow(view).to receive(:error_tracking_setting).and_return(error_tracking_setting)
 
     stub_licensed_features(tracing: true)
   end

locale/gitlab.pot

@@ -3446,6 +3446,9 @@ msgstr ""
 msgid "Error Reporting and Logging"
 msgstr ""
 
+msgid "Error Tracking"
+msgstr ""
+
 msgid "Error creating epic"
 msgstr ""
 
@@ -10909,12 +10912,6 @@ msgstr ""
 msgid "register"
 msgstr ""
 
-msgid "quick actions"
-msgstr ""
-
-msgid "register"
-msgstr ""
-
 msgid "remaining"
 msgstr ""