Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42

42 files changed, 802 insertions, 954 deletions

diff --git a/spec/controllers/projects/artifacts_controller_spec.rb b/spec/controllers/projects/artifacts_controller_spec.rb
index c707b5dc39d..c91aa562a85 100644
--- a/spec/controllers/projects/artifacts_controller_spec.rb
+++ b/spec/controllers/projects/artifacts_controller_spec.rb
@@ -9,11 +9,13 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts
   let_it_be(:project) { create(:project, :repository, :public) }
 
   let_it_be(:pipeline, reload: true) do
-    create(:ci_pipeline,
-            project: project,
-            sha: project.commit.sha,
-            ref: project.default_branch,
-            status: 'success')
+    create(
+      :ci_pipeline,
+      project: project,
+      sha: project.commit.sha,
+      ref: project.default_branch,
+      status: 'success'
+    )
   end
 
   let!(:job) { create(:ci_build, :success, :artifacts, pipeline: pipeline) }
@@ -177,9 +179,10 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts
           end
 
           it 'sends the codequality report' do
-            expect(controller).to receive(:send_file)
-                              .with(job.job_artifacts_codequality.file.path,
-                                    hash_including(disposition: 'attachment', filename: filename)).and_call_original
+            expect(controller).to receive(:send_file).with(
+              job.job_artifacts_codequality.file.path,
+              hash_including(disposition: 'attachment', filename: filename)
+            ).and_call_original
 
             download_artifact(file_type: file_type)
 
@@ -557,8 +560,7 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts
 
       context 'with regular branch' do
         before do
-          pipeline.update!(ref: 'master',
-                           sha: project.commit('master').sha)
+          pipeline.update!(ref: 'master', sha: project.commit('master').sha)
 
           get :latest_succeeded, params: params_from_ref('master')
         end
@@ -568,8 +570,7 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts
 
       context 'with branch name containing slash' do
         before do
-          pipeline.update!(ref: 'improve/awesome',
-                           sha: project.commit('improve/awesome').sha)
+          pipeline.update!(ref: 'improve/awesome', sha: project.commit('improve/awesome').sha)
 
           get :latest_succeeded, params: params_from_ref('improve/awesome')
         end
@@ -579,8 +580,7 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts
 
       context 'with branch name and path containing slashes' do
         before do
-          pipeline.update!(ref: 'improve/awesome',
-                           sha: project.commit('improve/awesome').sha)
+          pipeline.update!(ref: 'improve/awesome', sha: project.commit('improve/awesome').sha)
 
           get :latest_succeeded, params: params_from_ref('improve/awesome', job.name, 'file/README.md')
         end
@@ -596,11 +596,13 @@ RSpec.describe Projects::ArtifactsController, feature_category: :build_artifacts
         before do
           create_file_in_repo(project, 'master', 'master', 'test.txt', 'This is test')
 
-          create(:ci_pipeline,
+          create(
+            :ci_pipeline,
             project: project,
             sha: project.commit.sha,
             ref: project.default_branch,
-            status: 'failed')
+            status: 'failed'
+          )
 
           get :latest_succeeded, params: params_from_ref(project.default_branch)
         end
diff --git a/spec/controllers/projects/badges_controller_spec.rb b/spec/controllers/projects/badges_controller_spec.rb
index d41e8d6169f..ef2afd7ca38 100644
--- a/spec/controllers/projects/badges_controller_spec.rb
+++ b/spec/controllers/projects/badges_controller_spec.rb
@@ -98,6 +98,16 @@ RSpec.describe Projects::BadgesController do
         expect(response.body).to include('123')
       end
     end
+
+    if badge_type == :release
+      context 'when value_width param is used' do
+        it 'sets custom value width' do
+          get_badge(badge_type, value_width: '123')
+
+          expect(response.body).to include('123')
+        end
+      end
+    end
   end
 
   shared_examples 'a badge resource' do |badge_type|
@@ -186,7 +196,7 @@ RSpec.describe Projects::BadgesController do
       namespace_id: project.namespace.to_param,
       project_id: project,
       ref: pipeline.ref
-    }.merge(args.slice(:style, :key_text, :key_width, :ignore_skipped))
+    }.merge(args.slice(:style, :key_text, :key_width, :value_width, :ignore_skipped))
 
     get badge, params: params, format: :svg
   end
diff --git a/spec/controllers/projects/blame_controller_spec.rb b/spec/controllers/projects/blame_controller_spec.rb
index 62a544bb3fc..f322c78b5e3 100644
--- a/spec/controllers/projects/blame_controller_spec.rb
+++ b/spec/controllers/projects/blame_controller_spec.rb
@@ -17,12 +17,7 @@ RSpec.describe Projects::BlameController do
     render_views
 
     before do
-      get(:show,
-          params: {
-            namespace_id: project.namespace,
-            project_id: project,
-            id: id
-          })
+      get :show, params: { namespace_id: project.namespace, project_id: project, id: id }
     end
 
     context "valid branch, valid file" do
@@ -35,8 +30,7 @@ RSpec.describe Projects::BlameController do
       let(:id) { 'master/files/ruby/invalid-path.rb' }
 
       it 'redirects' do
-        expect(subject)
-            .to redirect_to("/#{project.full_path}/-/tree/master")
+        expect(subject).to redirect_to("/#{project.full_path}/-/tree/master")
       end
     end
 
diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb
index 887a5ba598f..c091badd09d 100644
--- a/spec/controllers/projects/blob_controller_spec.rb
+++ b/spec/controllers/projects/blob_controller_spec.rb
@@ -75,13 +75,7 @@ RSpec.describe Projects::BlobController do
         let(:id) { 'master/README.md' }
 
         before do
-          get(:show,
-              params: {
-                namespace_id: project.namespace,
-                project_id: project,
-                id: id
-              },
-              format: :json)
+          get :show, params: { namespace_id: project.namespace, project_id: project, id: id }, format: :json
         end
 
         it do
@@ -95,14 +89,7 @@ RSpec.describe Projects::BlobController do
         let(:id) { 'master/README.md' }
 
         before do
-          get(:show,
-              params: {
-                namespace_id: project.namespace,
-                project_id: project,
-                id: id,
-                viewer: 'none'
-              },
-              format: :json)
+          get :show, params: { namespace_id: project.namespace, project_id: project, id: id, viewer: 'none' }, format: :json
         end
 
         it do
@@ -115,12 +102,8 @@ RSpec.describe Projects::BlobController do
 
     context 'with tree path' do
       before do
-        get(:show,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              id: id
-            })
+        get :show, params: { namespace_id: project.namespace, project_id: project, id: id }
+
         controller.instance_variable_set(:@blob, nil)
       end
 
@@ -362,11 +345,23 @@ RSpec.describe Projects::BlobController do
       end
     end
 
-    it_behaves_like 'tracking unique hll events' do
+    context 'events tracking' do
+      let(:target_event) { 'g_edit_by_sfe' }
+
       subject(:request) { put :update, params: default_params }
 
-      let(:target_event) { 'g_edit_by_sfe' }
-      let(:expected_value) { instance_of(Integer) }
+      it_behaves_like 'tracking unique hll events' do
+        let(:expected_value) { instance_of(Integer) }
+      end
+
+      it_behaves_like 'Snowplow event tracking with RedisHLL context' do
+        let(:action) { 'perform_sfe_action' }
+        let(:category) { described_class.to_s }
+        let(:namespace) { project.namespace.reload }
+        let(:property) { target_event }
+        let(:label) { 'usage_activity_by_stage_monthly.create.action_monthly_active_users_sfe_edit' }
+        let(:feature_flag_name) { 'route_hll_to_snowplow_phase4' }
+      end
     end
   end
 
@@ -494,6 +489,7 @@ RSpec.describe Projects::BlobController do
 
   describe 'POST create' do
     let(:user) { create(:user) }
+    let(:target_event) { 'g_edit_by_sfe' }
     let(:default_params) do
       {
         namespace_id: project.namespace,
@@ -515,10 +511,18 @@ RSpec.describe Projects::BlobController do
     subject(:request) { post :create, params: default_params }
 
     it_behaves_like 'tracking unique hll events' do
-      let(:target_event) { 'g_edit_by_sfe' }
       let(:expected_value) { instance_of(Integer) }
     end
 
+    it_behaves_like 'Snowplow event tracking with RedisHLL context' do
+      let(:action) { 'perform_sfe_action' }
+      let(:category) { described_class.to_s }
+      let(:namespace) { project.namespace }
+      let(:property) { target_event }
+      let(:label) { 'usage_activity_by_stage_monthly.create.action_monthly_active_users_sfe_edit' }
+      let(:feature_flag_name) { 'route_hll_to_snowplow_phase4' }
+    end
+
     it 'redirects to blob' do
       request
 
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb
index dcde22c1fd6..600f8047a1d 100644
--- a/spec/controllers/projects/branches_controller_spec.rb
+++ b/spec/controllers/projects/branches_controller_spec.rb
@@ -22,13 +22,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
       before do
         sign_in(developer)
 
-        post :create,
-             params: {
-               namespace_id: project.namespace,
-               project_id: project,
-               branch_name: branch,
-               ref: ref
-             }
+        post :create, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          branch_name: branch,
+          ref: ref
+        }
       end
 
       context "valid branch name, valid source" do
@@ -83,13 +82,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
       end
 
       it 'redirects' do
-        post :create,
-             params: {
-               namespace_id: project.namespace,
-               project_id: project,
-               branch_name: branch,
-               issue_iid: issue.iid
-             }
+        post :create, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          branch_name: branch,
+          issue_iid: issue.iid
+        }
 
         expect(subject)
           .to redirect_to("/#{project.full_path}/-/tree/1-feature-branch")
@@ -98,13 +96,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
       it 'posts a system note' do
         expect(SystemNoteService).to receive(:new_issue_branch).with(issue, project, developer, "1-feature-branch", branch_project: project)
 
-        post :create,
-             params: {
-               namespace_id: project.namespace,
-               project_id: project,
-               branch_name: branch,
-               issue_iid: issue.iid
-             }
+        post :create, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          branch_name: branch,
+          issue_iid: issue.iid
+        }
       end
 
       context 'confidential_issue_project_id is present' do
@@ -167,13 +164,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
           expect_any_instance_of(::Branches::CreateService).to receive(:execute).and_return(result)
           expect(SystemNoteService).to receive(:new_issue_branch).and_return(true)
 
-          post :create,
-               params: {
-                 namespace_id: project.namespace.to_param,
-                 project_id: project.to_param,
-                 branch_name: branch,
-                 issue_iid: issue.iid
-               }
+          post :create, params: {
+            namespace_id: project.namespace.to_param,
+            project_id: project.to_param,
+            branch_name: branch,
+            issue_iid: issue.iid
+          }
 
           expect(response).to redirect_to project_tree_path(project, branch)
         end
@@ -189,13 +185,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
             expect_any_instance_of(::Branches::CreateService).to receive(:execute).and_return(result)
             expect(SystemNoteService).to receive(:new_issue_branch).and_return(true)
 
-            post :create,
-                 params: {
-                   namespace_id: project.namespace.to_param,
-                   project_id: project.to_param,
-                   branch_name: branch,
-                   issue_iid: issue.iid
-                 }
+            post :create, params: {
+              namespace_id: project.namespace.to_param,
+              project_id: project.to_param,
+              branch_name: branch,
+              issue_iid: issue.iid
+            }
 
             expect(response.location).to include(project_new_blob_path(project, branch))
             expect(response).to have_gitlab_http_status(:found)
@@ -210,13 +205,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
           expect_any_instance_of(::Branches::CreateService).to receive(:execute).and_return(result)
           expect(SystemNoteService).to receive(:new_issue_branch).and_return(true)
 
-          post :create,
-               params: {
-                namespace_id: project.namespace.to_param,
-                project_id: project.to_param,
-                branch_name: branch,
-                issue_iid: issue.iid
-               }
+          post :create, params: {
+            namespace_id: project.namespace.to_param,
+            project_id: project.to_param,
+            branch_name: branch,
+            issue_iid: issue.iid
+          }
 
           expect(response.location).to include(project_new_blob_path(project, branch))
           expect(response).to have_gitlab_http_status(:found)
@@ -229,13 +223,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
         it "doesn't post a system note" do
           expect(SystemNoteService).not_to receive(:new_issue_branch)
 
-          post :create,
-               params: {
-                namespace_id: project.namespace,
-                project_id: project,
-                branch_name: branch,
-                issue_iid: issue.iid
-               }
+          post :create, params: {
+            namespace_id: project.namespace,
+            project_id: project,
+            branch_name: branch,
+            issue_iid: issue.iid
+          }
         end
       end
 
@@ -249,13 +242,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
         it "doesn't post a system note" do
           expect(SystemNoteService).not_to receive(:new_issue_branch)
 
-          post :create,
-               params: {
-                namespace_id: project.namespace,
-                project_id: project,
-                branch_name: branch,
-                issue_iid: issue.iid
-               }
+          post :create, params: {
+            namespace_id: project.namespace,
+            project_id: project,
+            branch_name: branch,
+            issue_iid: issue.iid
+          }
         end
       end
     end
@@ -285,18 +277,17 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
         create_branch name: "<script>alert('merge');</script>", ref: "<script>alert('ref');</script>"
 
         expect(response).to have_gitlab_http_status(:unprocessable_entity)
+        expect(response.body).to include 'Failed to create branch'
       end
     end
 
     def create_branch(name:, ref:)
-      post :create,
-           format: :json,
-           params: {
-             namespace_id: project.namespace.to_param,
-             project_id: project.to_param,
-             branch_name: name,
-             ref: ref
-           }
+      post :create, format: :json, params: {
+        namespace_id: project.namespace.to_param,
+        project_id: project.to_param,
+        branch_name: name,
+        ref: ref
+      }
     end
   end
 
@@ -345,13 +336,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
     before do
       sign_in(developer)
 
-      post :destroy,
-           format: format,
-           params: {
-             id: branch,
-             namespace_id: project.namespace,
-             project_id: project
-           }
+      post :destroy, format: format, params: {
+        id: branch,
+        namespace_id: project.namespace,
+        project_id: project
+      }
     end
 
     context 'as JS' do
@@ -445,11 +434,10 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
 
   describe "DELETE destroy_all_merged" do
     def destroy_all_merged
-      delete :destroy_all_merged,
-             params: {
-               namespace_id: project.namespace,
-               project_id: project
-             }
+      delete :destroy_all_merged, params: {
+        namespace_id: project.namespace,
+        project_id: project
+      }
     end
 
     context 'when user is allowed to push' do
@@ -492,13 +480,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
 
     context 'when rendering a JSON format' do
       it 'filters branches by name' do
-        get :index,
-            format: :json,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              search: 'master'
-            }
+        get :index, format: :json, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          search: 'master'
+        }
 
         expect(json_response.length).to eq 1
         expect(json_response.first).to eq 'master'
@@ -523,13 +509,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
           status: :success,
           created_at: 2.months.ago)
 
-        get :index,
-            format: :html,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              state: 'all'
-            }
+        get :index, format: :html, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          state: 'all'
+        }
 
         expect(assigns[:branch_pipeline_statuses]["master"].group).to eq("success")
         expect(assigns[:sort]).to eq('updated_desc')
@@ -555,13 +539,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
           status: :success,
           created_at: 2.months.ago)
 
-        get :index,
-            format: :html,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              state: 'all'
-            }
+        get :index, format: :html, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          state: 'all'
+        }
 
         expect(assigns[:branch_pipeline_statuses]["master"].group).to eq("running")
         expect(assigns[:branch_pipeline_statuses]["test"].group).to eq("success")
@@ -570,13 +552,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
 
     context 'when a branch contains no pipelines' do
       it 'no commit statuses are received' do
-        get :index,
-            format: :html,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              state: 'stale'
-            }
+        get :index, format: :html, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          state: 'stale'
+        }
 
         expect(assigns[:branch_pipeline_statuses]).to be_blank
         expect(assigns[:sort]).to eq('updated_asc')
@@ -589,14 +569,12 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
     # was not raised whenever the cache is enabled yet cold.
     context 'when cache is enabled yet cold', :request_store do
       it 'return with a status 200' do
-        get :index,
-            format: :html,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              sort: 'name_asc',
-              state: 'all'
-            }
+        get :index, format: :html, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          sort: 'name_asc',
+          state: 'all'
+        }
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(assigns[:sort]).to eq('name_asc')
@@ -609,13 +587,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
       end
 
       it 'return with a status 200' do
-        get :index,
-            format: :html,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              state: 'all'
-            }
+        get :index, format: :html, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          state: 'all'
+        }
 
         expect(response).to have_gitlab_http_status(:ok)
       end
@@ -623,37 +599,31 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
 
     context 'when deprecated sort/search/page parameters are specified' do
       it 'returns with a status 301 when sort specified' do
-        get :index,
-            format: :html,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              sort: 'updated_asc'
-            }
+        get :index, format: :html, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          sort: 'updated_asc'
+        }
 
         expect(response).to redirect_to project_branches_filtered_path(project, state: 'all')
       end
 
       it 'returns with a status 301 when search specified' do
-        get :index,
-            format: :html,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              search: 'feature'
-            }
+        get :index, format: :html, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          search: 'feature'
+        }
 
         expect(response).to redirect_to project_branches_filtered_path(project, state: 'all')
       end
 
       it 'returns with a status 301 when page specified' do
-        get :index,
-            format: :html,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              page: 2
-            }
+        get :index, format: :html, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          page: 2
+        }
 
         expect(response).to redirect_to project_branches_filtered_path(project, state: 'all')
       end
@@ -747,13 +717,11 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
     end
 
     it 'returns the commit counts behind and ahead of default branch' do
-      get :diverging_commit_counts,
-          format: :json,
-          params: {
-            namespace_id: project.namespace,
-            project_id: project,
-            names: %w[fix add-pdf-file branch-merged]
-          }
+      get :diverging_commit_counts, format: :json, params: {
+        namespace_id: project.namespace,
+        project_id: project,
+        names: %w[fix add-pdf-file branch-merged]
+      }
 
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response).to eq(
@@ -766,12 +734,10 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
     it 'returns the commits counts with no names provided' do
       allow_any_instance_of(Repository).to receive(:branch_count).and_return(Kaminari.config.default_per_page)
 
-      get :diverging_commit_counts,
-          format: :json,
-          params: {
-            namespace_id: project.namespace,
-            project_id: project
-          }
+      get :diverging_commit_counts, format: :json, params: {
+        namespace_id: project.namespace,
+        project_id: project
+      }
 
       expect(response).to have_gitlab_http_status(:ok)
       expect(json_response.count).to be > 1
@@ -783,25 +749,21 @@ RSpec.describe Projects::BranchesController, feature_category: :source_code_mana
       end
 
       it 'returns 422 if no names are specified' do
-        get :diverging_commit_counts,
-            format: :json,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project
-            }
+        get :diverging_commit_counts, format: :json, params: {
+          namespace_id: project.namespace,
+          project_id: project
+        }
 
         expect(response).to have_gitlab_http_status(:unprocessable_entity)
         expect(json_response['error']).to eq("Specify at least one and at most #{Kaminari.config.default_per_page} branch names")
       end
 
       it 'returns the list of counts' do
-        get :diverging_commit_counts,
-            format: :json,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              names: %w[fix add-pdf-file branch-merged]
-            }
+        get :diverging_commit_counts, format: :json, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          names: %w[fix add-pdf-file branch-merged]
+        }
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(json_response.count).to be > 1
diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb
index a4f7c92f5cd..38f72c769f3 100644
--- a/spec/controllers/projects/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
@@ -420,11 +420,12 @@ RSpec.describe Projects::ClustersController, feature_category: :kubernetes_manag
 
   describe 'PUT update' do
     def go(format: :html)
-      put :update, params: params.merge(namespace_id: project.namespace.to_param,
-                                        project_id: project.to_param,
-                                        id: cluster,
-                                        format: format
-                                       )
+      put :update, params: params.merge(
+        namespace_id: project.namespace.to_param,
+        project_id: project.to_param,
+        id: cluster,
+        format: format
+      )
     end
 
     before do
diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb
index 8d3939d8133..36206a88786 100644
--- a/spec/controllers/projects/commit_controller_spec.rb
+++ b/spec/controllers/projects/commit_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Projects::CommitController do
+RSpec.describe Projects::CommitController, feature_category: :source_code_management do
   include ProjectForksHelper
 
   let_it_be(:project)  { create(:project, :repository) }
@@ -155,12 +155,7 @@ RSpec.describe Projects::CommitController do
       let(:commit) { fork_project.commit('remove-submodule') }
 
       it 'renders it' do
-        get(:show,
-            params: {
-              namespace_id: fork_project.namespace,
-              project_id: fork_project,
-              id: commit.id
-            })
+        get :show, params: { namespace_id: fork_project.namespace, project_id: fork_project, id: commit.id }
 
         expect(response).to be_successful
       end
@@ -174,10 +169,10 @@ RSpec.describe Projects::CommitController do
         go(id: commit.id, merge_request_iid: merge_request.iid)
 
         expect(assigns(:new_diff_note_attrs)).to eq({
-                                                      noteable_type: 'MergeRequest',
-                                                      noteable_id: merge_request.id,
-                                                      commit_id: commit.id
-                                                    })
+          noteable_type: 'MergeRequest',
+          noteable_id: merge_request.id,
+          commit_id: commit.id
+        })
         expect(response).to be_ok
       end
     end
@@ -187,12 +182,7 @@ RSpec.describe Projects::CommitController do
     it 'contains branch and tags information' do
       commit = project.commit('5937ac0a7beb003549fc5fd26fc247adbce4a52e')
 
-      get(:branches,
-          params: {
-            namespace_id: project.namespace,
-            project_id: project,
-            id: commit.id
-          })
+      get :branches, params: { namespace_id: project.namespace, project_id: project, id: commit.id }
 
       expect(assigns(:branches)).to include('master', 'feature_conflict')
       expect(assigns(:branches_limit_exceeded)).to be_falsey
@@ -205,12 +195,7 @@ RSpec.describe Projects::CommitController do
       allow_any_instance_of(Repository).to receive(:branch_count).and_return(1001)
       allow_any_instance_of(Repository).to receive(:tag_count).and_return(1001)
 
-      get(:branches,
-          params: {
-            namespace_id: project.namespace,
-            project_id: project,
-            id: commit.id
-          })
+      get :branches, params: { namespace_id: project.namespace, project_id: project, id: commit.id }
 
       expect(assigns(:branches)).to eq([])
       expect(assigns(:branches_limit_exceeded)).to be_truthy
@@ -234,12 +219,7 @@ RSpec.describe Projects::CommitController do
   describe 'POST revert' do
     context 'when target branch is not provided' do
       it 'renders the 404 page' do
-        post(:revert,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              id: commit.id
-            })
+        post :revert, params: { namespace_id: project.namespace, project_id: project, id: commit.id }
 
         expect(response).not_to be_successful
         expect(response).to have_gitlab_http_status(:not_found)
@@ -248,13 +228,7 @@ RSpec.describe Projects::CommitController do
 
     context 'when the revert commit is missing' do
       it 'renders the 404 page' do
-        post(:revert,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              start_branch: 'master',
-              id: '1234567890'
-            })
+        post :revert, params: { namespace_id: project.namespace, project_id: project, start_branch: 'master', id: '1234567890' }
 
         expect(response).not_to be_successful
         expect(response).to have_gitlab_http_status(:not_found)
@@ -263,13 +237,7 @@ RSpec.describe Projects::CommitController do
 
     context 'when the revert was successful' do
       it 'redirects to the commits page' do
-        post(:revert,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              start_branch: 'master',
-              id: commit.id
-            })
+        post :revert, params: { namespace_id: project.namespace, project_id: project, start_branch: 'master', id: commit.id }
 
         expect(response).to redirect_to project_commits_path(project, 'master')
         expect(flash[:notice]).to eq('The commit has been successfully reverted.')
@@ -278,27 +246,53 @@ RSpec.describe Projects::CommitController do
 
     context 'when the revert failed' do
       before do
-        post(:revert,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              start_branch: 'master',
-              id: commit.id
-            })
+        post :revert, params: { namespace_id: project.namespace, project_id: project, start_branch: 'master', id: commit.id }
       end
 
       it 'redirects to the commit page' do
         # Reverting a commit that has been already reverted.
-        post(:revert,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              start_branch: 'master',
-              id: commit.id
-            })
+        post :revert, params: { namespace_id: project.namespace, project_id: project, start_branch: 'master', id: commit.id }
 
         expect(response).to redirect_to project_commit_path(project, commit.id)
-        expect(flash[:alert]).to match('Sorry, we cannot revert this commit automatically.')
+        expect(flash[:alert]).to match('Commit revert failed:')
+      end
+    end
+
+    context 'in the context of a merge_request' do
+      let(:merge_request) { create(:merge_request, :merged, source_project: project) }
+      let(:repository) { project.repository }
+
+      before do
+        merge_commit_id = repository.merge(user,
+          merge_request.diff_head_sha,
+          merge_request,
+          'Test message')
+
+        repository.commit(merge_commit_id)
+        merge_request.update!(merge_commit_sha: merge_commit_id)
+      end
+
+      context 'when the revert was successful' do
+        it 'redirects to the merge request page' do
+          post :revert, params: { namespace_id: project.namespace, project_id: project, start_branch: 'master', id: merge_request.merge_commit_sha }
+
+          expect(response).to redirect_to project_merge_request_path(project, merge_request)
+          expect(flash[:notice]).to eq('The merge request has been successfully reverted.')
+        end
+      end
+
+      context 'when the revert failed' do
+        before do
+          post :revert, params: { namespace_id: project.namespace, project_id: project, start_branch: 'master', id: merge_request.merge_commit_sha }
+        end
+
+        it 'redirects to the merge request page' do
+          # Reverting a merge request that has been already reverted.
+          post :revert, params: { namespace_id: project.namespace, project_id: project, start_branch: 'master', id: merge_request.merge_commit_sha }
+
+          expect(response).to redirect_to project_merge_request_path(project, merge_request)
+          expect(flash[:alert]).to match('Merge request revert failed:')
+        end
       end
     end
   end
@@ -306,12 +300,7 @@ RSpec.describe Projects::CommitController do
   describe 'POST cherry_pick' do
     context 'when target branch is not provided' do
       it 'renders the 404 page' do
-        post(:cherry_pick,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              id: master_pickable_commit.id
-            })
+        post :cherry_pick, params: { namespace_id: project.namespace, project_id: project, id: master_pickable_commit.id }
 
         expect(response).not_to be_successful
         expect(response).to have_gitlab_http_status(:not_found)
@@ -320,13 +309,7 @@ RSpec.describe Projects::CommitController do
 
     context 'when the cherry-pick commit is missing' do
       it 'renders the 404 page' do
-        post(:cherry_pick,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              start_branch: 'master',
-              id: '1234567890'
-            })
+        post :cherry_pick, params: { namespace_id: project.namespace, project_id: project, start_branch: 'master', id: '1234567890' }
 
         expect(response).not_to be_successful
         expect(response).to have_gitlab_http_status(:not_found)
@@ -335,13 +318,7 @@ RSpec.describe Projects::CommitController do
 
     context 'when the cherry-pick was successful' do
       it 'redirects to the commits page' do
-        post(:cherry_pick,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              start_branch: 'master',
-              id: master_pickable_commit.id
-            })
+        post :cherry_pick, params: { namespace_id: project.namespace, project_id: project, start_branch: 'master', id: master_pickable_commit.id }
 
         expect(response).to redirect_to project_commits_path(project, 'master')
         expect(flash[:notice]).to eq('The commit has been successfully cherry-picked into master.')
@@ -350,27 +327,52 @@ RSpec.describe Projects::CommitController do
 
     context 'when the cherry_pick failed' do
       before do
-        post(:cherry_pick,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              start_branch: 'master',
-              id: master_pickable_commit.id
-            })
+        post :cherry_pick, params: { namespace_id: project.namespace, project_id: project, start_branch: 'master', id: master_pickable_commit.id }
       end
 
       it 'redirects to the commit page' do
         # Cherry-picking a commit that has been already cherry-picked.
-        post(:cherry_pick,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              start_branch: 'master',
-              id: master_pickable_commit.id
-            })
+        post :cherry_pick, params: { namespace_id: project.namespace, project_id: project, start_branch: 'master', id: master_pickable_commit.id }
 
         expect(response).to redirect_to project_commit_path(project, master_pickable_commit.id)
-        expect(flash[:alert]).to match('Sorry, we cannot cherry-pick this commit automatically.')
+        expect(flash[:alert]).to match('Commit cherry-pick failed:')
+      end
+    end
+
+    context 'in the context of a merge_request' do
+      let(:merge_request) { create(:merge_request, :merged, source_project: project) }
+      let(:repository) { project.repository }
+
+      before do
+        merge_commit_id = repository.merge(user,
+          merge_request.diff_head_sha,
+          merge_request,
+          'Test message')
+        repository.commit(merge_commit_id)
+        merge_request.update!(merge_commit_sha: merge_commit_id)
+      end
+
+      context 'when the cherry_pick was successful' do
+        it 'redirects to the merge request page' do
+          post :cherry_pick, params: { namespace_id: project.namespace, project_id: project, start_branch: 'merge-test', id: merge_request.merge_commit_sha }
+
+          expect(response).to redirect_to project_merge_request_path(project, merge_request)
+          expect(flash[:notice]).to eq('The merge request has been successfully cherry-picked into merge-test.')
+        end
+      end
+
+      context 'when the cherry_pick failed' do
+        before do
+          post :cherry_pick, params: { namespace_id: project.namespace, project_id: project, start_branch: 'merge-test', id: merge_request.merge_commit_sha }
+        end
+
+        it 'redirects to the merge request page' do
+          # Reverting a merge request that has been already cherry-picked.
+          post :cherry_pick, params: { namespace_id: project.namespace, project_id: project, start_branch: 'merge-test', id: merge_request.merge_commit_sha }
+
+          expect(response).to redirect_to project_merge_request_path(project, merge_request)
+          expect(flash[:alert]).to match('Merge request cherry-pick failed:')
+        end
       end
     end
 
@@ -381,15 +383,14 @@ RSpec.describe Projects::CommitController do
       let(:create_merge_request) { nil }
 
       def send_request
-        post(:cherry_pick,
-            params: {
-              namespace_id: forked_project.namespace,
-              project_id: forked_project,
-              target_project_id: target_project.id,
-              start_branch: 'feature',
-              id: forked_project.commit.id,
-              create_merge_request: create_merge_request
-            })
+        post :cherry_pick, params: {
+          namespace_id: forked_project.namespace,
+          project_id: forked_project,
+          target_project_id: target_project.id,
+          start_branch: 'feature',
+          id: forked_project.commit.id,
+          create_merge_request: create_merge_request
+        }
       end
 
       def merge_request_url(source_project, branch)
@@ -478,8 +479,7 @@ RSpec.describe Projects::CommitController do
             diff_for_path(id: commit2.id, old_path: existing_path, new_path: existing_path)
 
             expect(assigns(:diff_notes_disabled)).to be_falsey
-            expect(assigns(:new_diff_note_attrs)).to eq(noteable_type: 'Commit',
-                                                        commit_id: commit2.id)
+            expect(assigns(:new_diff_note_attrs)).to eq(noteable_type: 'Commit', commit_id: commit2.id)
           end
 
           it 'only renders the diffs for the path given' do
diff --git a/spec/controllers/projects/commits_controller_spec.rb b/spec/controllers/projects/commits_controller_spec.rb
index 67aa82dacbb..9e03d1f315b 100644
--- a/spec/controllers/projects/commits_controller_spec.rb
+++ b/spec/controllers/projects/commits_controller_spec.rb
@@ -18,11 +18,7 @@ RSpec.describe Projects::CommitsController, feature_category: :source_code_manag
     describe "GET commits_root" do
       context "no ref is provided" do
         it 'redirects to the default branch of the project' do
-          get(:commits_root,
-              params: {
-                namespace_id: project.namespace,
-                project_id: project
-              })
+          get :commits_root, params: { namespace_id: project.namespace, project_id: project }
 
           expect(response).to redirect_to project_commits_path(project)
         end
@@ -34,12 +30,7 @@ RSpec.describe Projects::CommitsController, feature_category: :source_code_manag
 
       context 'with file path' do
         before do
-          get(:show,
-              params: {
-                namespace_id: project.namespace,
-                project_id: project,
-                id: id
-              })
+          get :show, params: { namespace_id: project.namespace, project_id: project, id: id }
         end
 
         context "valid branch, valid file" do
@@ -78,13 +69,7 @@ RSpec.describe Projects::CommitsController, feature_category: :source_code_manag
             offset: 0
           ).and_call_original
 
-          get(:show,
-              params: {
-                namespace_id: project.namespace,
-                project_id: project,
-                id: id,
-                limit: "foo"
-            })
+          get :show, params: { namespace_id: project.namespace, project_id: project, id: id, limit: "foo" }
 
           expect(response).to be_successful
         end
@@ -98,27 +83,45 @@ RSpec.describe Projects::CommitsController, feature_category: :source_code_manag
               offset: 0
             ).and_call_original
 
-            get(:show, params: {
+            get :show, params: {
               namespace_id: project.namespace,
               project_id: project,
               id: id,
               limit: { 'broken' => 'value' }
-            })
+            }
 
             expect(response).to be_successful
           end
         end
       end
 
+      it 'loads tags for commits' do
+        expect_next_instance_of(CommitCollection) do |collection|
+          expect(collection).to receive(:load_tags)
+        end
+        get :show, params: { namespace_id: project.namespace, project_id: project, id: 'master/README.md' }
+      end
+
+      context 'when the show_tags_on_commits_view flag is disabled' do
+        let(:id) { "master/README.md" }
+
+        before do
+          stub_feature_flags(show_tags_on_commits_view: false)
+        end
+
+        it 'does not load tags' do
+          expect_next_instance_of(CommitCollection) do |collection|
+            expect(collection).not_to receive(:load_tags)
+          end
+
+          get :show, params: { namespace_id: project.namespace, project_id: project, id: id }
+        end
+      end
+
       context "when the ref name ends in .atom" do
         context "when the ref does not exist with the suffix" do
           before do
-            get(:show,
-                params: {
-                  namespace_id: project.namespace,
-                  project_id: project,
-                  id: "master.atom"
-                })
+            get :show, params: { namespace_id: project.namespace, project_id: project, id: "master.atom" }
           end
 
           it "renders as atom" do
@@ -138,12 +141,11 @@ RSpec.describe Projects::CommitsController, feature_category: :source_code_manag
             allow_any_instance_of(Repository).to receive(:commit).and_call_original
             allow_any_instance_of(Repository).to receive(:commit).with('master.atom').and_return(commit)
 
-            get(:show,
-                params: {
-                  namespace_id: project.namespace,
-                  project_id: project,
-                  id: "master.atom"
-                })
+            get :show, params: {
+              namespace_id: project.namespace,
+              project_id: project,
+              id: "master.atom"
+            }
           end
 
           it "renders as HTML" do
@@ -182,13 +184,11 @@ RSpec.describe Projects::CommitsController, feature_category: :source_code_manag
       before do
         expect(::Gitlab::GitalyClient).to receive(:allow_ref_name_caching).and_call_original unless id.include?(' ')
 
-        get(:signatures,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              id: id
-            },
-            format: :json)
+        get :signatures, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          id: id
+        }, format: :json
       end
 
       context "valid branch" do
diff --git a/spec/controllers/projects/cycle_analytics_controller_spec.rb b/spec/controllers/projects/cycle_analytics_controller_spec.rb
index 034e6104f99..4ff8c21706b 100644
--- a/spec/controllers/projects/cycle_analytics_controller_spec.rb
+++ b/spec/controllers/projects/cycle_analytics_controller_spec.rb
@@ -15,11 +15,7 @@ RSpec.describe Projects::CycleAnalyticsController do
     it 'increases the counter' do
       expect(Gitlab::UsageDataCounters::CycleAnalyticsCounter).to receive(:count).with(:views)
 
-      get(:show,
-          params: {
-            namespace_id: project.namespace,
-            project_id: project
-          })
+      get :show, params: { namespace_id: project.namespace, project_id: project }
 
       expect(response).to be_successful
     end
@@ -35,7 +31,6 @@ RSpec.describe Projects::CycleAnalyticsController do
       subject { get :show, params: request_params, format: :html }
 
       let(:request_params) { { namespace_id: project.namespace, project_id: project } }
-      let(:feature_flag_name) { :route_hll_to_snowplow_phase2 }
       let(:category) { described_class.name }
       let(:action) { 'perform_analytics_usage_action' }
       let(:namespace) { project.namespace }
diff --git a/spec/controllers/projects/deploy_keys_controller_spec.rb b/spec/controllers/projects/deploy_keys_controller_spec.rb
index ec63bad22b5..52a605cf548 100644
--- a/spec/controllers/projects/deploy_keys_controller_spec.rb
+++ b/spec/controllers/projects/deploy_keys_controller_spec.rb
@@ -276,9 +276,9 @@ RSpec.describe Projects::DeployKeysController do
     let(:extra_params) { {} }
 
     subject do
-      put :update, params: extra_params.reverse_merge(id: deploy_key.id,
-                                                      namespace_id: project.namespace,
-                                                      project_id: project)
+      put :update, params: extra_params.reverse_merge(
+        id: deploy_key.id, namespace_id: project.namespace, project_id: project
+      )
     end
 
     def deploy_key_params(title, can_push)
@@ -330,9 +330,7 @@ RSpec.describe Projects::DeployKeysController do
       context 'when a different deploy key id param is injected' do
         let(:extra_params) { deploy_key_params('updated title', '1') }
         let(:hacked_params) do
-          extra_params.reverse_merge(id: other_deploy_key_id,
-                                     namespace_id: project.namespace,
-                                     project_id: project)
+          extra_params.reverse_merge(id: other_deploy_key_id, namespace_id: project.namespace, project_id: project)
         end
 
         subject { put :update, params: hacked_params }
diff --git a/spec/controllers/projects/deployments_controller_spec.rb b/spec/controllers/projects/deployments_controller_spec.rb
index c6532e83441..a696eb933e9 100644
--- a/spec/controllers/projects/deployments_controller_spec.rb
+++ b/spec/controllers/projects/deployments_controller_spec.rb
@@ -210,8 +210,6 @@ RSpec.describe Projects::DeploymentsController do
   end
 
   def deployment_params(opts = {})
-    opts.reverse_merge(namespace_id: project.namespace,
-                       project_id: project,
-                       environment_id: environment.id)
+    opts.reverse_merge(namespace_id: project.namespace, project_id: project, environment_id: environment.id)
   end
 end
diff --git a/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb b/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb
index 5cc6e1b1bb4..1bb5112681c 100644
--- a/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb
+++ b/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb
@@ -139,10 +139,13 @@ RSpec.describe Projects::DesignManagement::Designs::ResizedImageController, feat
         let(:sha) { newest_version.sha }
 
         before do
-          create(:design, :with_smaller_image_versions,
-                 issue: create(:issue, project: project),
-                 versions_count: 1,
-                 versions_sha: sha)
+          create(
+            :design,
+            :with_smaller_image_versions,
+            issue: create(:issue, project: project),
+            versions_count: 1,
+            versions_sha: sha
+          )
         end
 
         it 'serves the newest image' do
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index 169fed1ab17..cbf632bfdb0 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -44,17 +44,9 @@ RSpec.describe Projects::EnvironmentsController, feature_category: :continuous_d
         allow_any_instance_of(Environment).to receive(:has_terminals?).and_return(true)
         allow_any_instance_of(Environment).to receive(:rollout_status).and_return(kube_deployment_rollout_status)
 
-        create(:environment, project: project,
-                             name: 'staging/review-1',
-                             state: :available)
-
-        create(:environment, project: project,
-                             name: 'staging/review-2',
-                             state: :available)
-
-        create(:environment, project: project,
-                             name: 'staging/review-3',
-                             state: :stopped)
+        create(:environment, project: project, name: 'staging/review-1', state: :available)
+        create(:environment, project: project, name: 'staging/review-2', state: :available)
+        create(:environment, project: project, name: 'staging/review-3', state: :stopped)
       end
 
       let(:environments) { json_response['environments'] }
@@ -84,9 +76,7 @@ RSpec.describe Projects::EnvironmentsController, feature_category: :continuous_d
         it 'ignores search option if is shorter than a minimum' do
           get :index, params: environment_params(format: :json, search: 'st')
 
-          expect(environments.map { |env| env['name'] }).to contain_exactly('production',
-                                                                             'staging/review-1',
-                                                                             'staging/review-2')
+          expect(environments.map { |env| env['name'] }).to contain_exactly('production', 'staging/review-1', 'staging/review-2')
           expect(json_response['available_count']).to eq 3
           expect(json_response['stopped_count']).to eq 1
         end
@@ -96,9 +86,7 @@ RSpec.describe Projects::EnvironmentsController, feature_category: :continuous_d
 
           get :index, params: environment_params(format: :json, search: 'review')
 
-          expect(environments.map { |env| env['name'] }).to contain_exactly('review-app',
-                                                                            'staging/review-1',
-                                                                            'staging/review-2')
+          expect(environments.map { |env| env['name'] }).to contain_exactly('review-app', 'staging/review-1', 'staging/review-2')
           expect(json_response['available_count']).to eq 3
           expect(json_response['stopped_count']).to eq 1
         end
@@ -245,23 +233,18 @@ RSpec.describe Projects::EnvironmentsController, feature_category: :continuous_d
 
     context 'when using JSON format' do
       before do
-        create(:environment, project: project,
-                             name: 'staging-1.0/review',
-                             state: :available)
-        create(:environment, project: project,
-                             name: 'staging-1.0/zzz',
-                             state: :available)
+        create(:environment, project: project, name: 'staging-1.0/review', state: :available)
+        create(:environment, project: project, name: 'staging-1.0/zzz', state: :available)
       end
 
       let(:environments) { json_response['environments'] }
 
       it 'sorts the subfolders lexicographically' do
         get :folder, params: {
-                       namespace_id: project.namespace,
-                       project_id: project,
-                       id: 'staging-1.0'
-                     },
-                     format: :json
+          namespace_id: project.namespace,
+          project_id: project,
+          id: 'staging-1.0'
+        }, format: :json
 
         expect(response).to be_ok
         expect(response).not_to render_template 'folder'
@@ -1016,98 +999,8 @@ RSpec.describe Projects::EnvironmentsController, feature_category: :continuous_d
     end
   end
 
-  describe '#append_info_to_payload' do
-    let(:search_param) { 'my search param' }
-
-    context 'when search_environment_logging feature is disabled' do
-      before do
-        stub_feature_flags(environments_search_logging: false)
-      end
-
-      it 'does not log search params in meta.environment.search' do
-        expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
-          method.call(payload)
-
-          expect(payload[:metadata]).not_to have_key('meta.environment.search')
-          expect(payload[:action]).to eq("search")
-          expect(payload[:controller]).to eq("Projects::EnvironmentsController")
-        end
-
-        get :search, params: environment_params(format: :json, search: search_param)
-      end
-
-      it 'logs params correctly when search params are missing' do
-        expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
-          method.call(payload)
-
-          expect(payload[:metadata]).not_to have_key('meta.environment.search')
-          expect(payload[:action]).to eq("search")
-          expect(payload[:controller]).to eq("Projects::EnvironmentsController")
-        end
-
-        get :search, params: environment_params(format: :json)
-      end
-
-      it 'logs params correctly when search params is empty string' do
-        expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
-          method.call(payload)
-
-          expect(payload[:metadata]).not_to have_key('meta.environment.search')
-          expect(payload[:action]).to eq("search")
-          expect(payload[:controller]).to eq("Projects::EnvironmentsController")
-        end
-
-        get :search, params: environment_params(format: :json, search: "")
-      end
-    end
-
-    context 'when search_environment_logging feature is enabled' do
-      before do
-        stub_feature_flags(environments_search_logging: true)
-      end
-
-      it 'logs search params in meta.environment.search' do
-        expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
-          method.call(payload)
-
-          expect(payload[:metadata]['meta.environment.search']).to eq(search_param)
-          expect(payload[:action]).to eq("search")
-          expect(payload[:controller]).to eq("Projects::EnvironmentsController")
-        end
-
-        get :search, params: environment_params(format: :json, search: search_param)
-      end
-
-      it 'logs params correctly when search params are missing' do
-        expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
-          method.call(payload)
-
-          expect(payload[:metadata]).not_to have_key('meta.environment.search')
-          expect(payload[:action]).to eq("search")
-          expect(payload[:controller]).to eq("Projects::EnvironmentsController")
-        end
-
-        get :search, params: environment_params(format: :json)
-      end
-
-      it 'logs params correctly when search params is empty string' do
-        expect(controller).to receive(:append_info_to_payload).and_wrap_original do |method, payload|
-          method.call(payload)
-
-          expect(payload[:metadata]).not_to have_key('meta.environment.search')
-          expect(payload[:action]).to eq("search")
-          expect(payload[:controller]).to eq("Projects::EnvironmentsController")
-        end
-
-        get :search, params: environment_params(format: :json, search: "")
-      end
-    end
-  end
-
   def environment_params(opts = {})
-    opts.reverse_merge(namespace_id: project.namespace,
-                       project_id: project,
-                       id: environment.id)
+    opts.reverse_merge(namespace_id: project.namespace, project_id: project, id: environment.id)
   end
 
   def additional_metrics(opts = {})
diff --git a/spec/controllers/projects/feature_flags_controller_spec.rb b/spec/controllers/projects/feature_flags_controller_spec.rb
index 29ad51d590f..ac2e4233709 100644
--- a/spec/controllers/projects/feature_flags_controller_spec.rb
+++ b/spec/controllers/projects/feature_flags_controller_spec.rb
@@ -193,8 +193,7 @@ RSpec.describe Projects::FeatureFlagsController do
     it 'routes based on iid' do
       other_project = create(:project)
       other_project.add_developer(user)
-      other_feature_flag = create(:operations_feature_flag, project: other_project,
-                                                            name: 'other_flag')
+      other_feature_flag = create(:operations_feature_flag, project: other_project, name: 'other_flag')
       params = {
         namespace_id: other_project.namespace,
         project_id: other_project,
@@ -485,8 +484,7 @@ RSpec.describe Projects::FeatureFlagsController do
 
     context 'when creating a version 2 feature flag with a gitlabUserList strategy' do
       let!(:user_list) do
-        create(:operations_feature_flag_user_list, project: project,
-                                                   name: 'My List', user_xids: 'user1,user2')
+        create(:operations_feature_flag_user_list, project: project, name: 'My List', user_xids: 'user1,user2')
       end
 
       let(:params) do
@@ -627,10 +625,7 @@ RSpec.describe Projects::FeatureFlagsController do
 
     context 'with a version 2 feature flag' do
       let!(:new_version_flag) do
-        create(:operations_feature_flag,
-               name: 'new-feature',
-               active: true,
-               project: project)
+        create(:operations_feature_flag, name: 'new-feature', active: true, project: project)
       end
 
       it 'creates a new strategy and scope' do
diff --git a/spec/controllers/projects/find_file_controller_spec.rb b/spec/controllers/projects/find_file_controller_spec.rb
index a6c71cff74b..68810bae368 100644
--- a/spec/controllers/projects/find_file_controller_spec.rb
+++ b/spec/controllers/projects/find_file_controller_spec.rb
@@ -18,12 +18,7 @@ RSpec.describe Projects::FindFileController do
     render_views
 
     before do
-      get(:show,
-          params: {
-            namespace_id: project.namespace,
-            project_id: project,
-            id: id
-          })
+      get :show, params: { namespace_id: project.namespace, project_id: project, id: id }
     end
 
     context "valid branch" do
@@ -41,13 +36,7 @@ RSpec.describe Projects::FindFileController do
 
   describe "GET #list" do
     def go(format: 'json')
-      get :list,
-          params: {
-            namespace_id: project.namespace,
-            project_id: project,
-            id: id
-          },
-          format: format
+      get :list, params: { namespace_id: project.namespace, project_id: project, id: id }, format: format
     end
 
     context "valid branch" do
diff --git a/spec/controllers/projects/forks_controller_spec.rb b/spec/controllers/projects/forks_controller_spec.rb
index 25c722173c1..3ea7054a64c 100644
--- a/spec/controllers/projects/forks_controller_spec.rb
+++ b/spec/controllers/projects/forks_controller_spec.rb
@@ -168,12 +168,7 @@ RSpec.describe Projects::ForksController, feature_category: :source_code_managem
     let(:format) { :html }
 
     subject(:do_request) do
-      get :new,
-          format: format,
-          params: {
-            namespace_id: project.namespace,
-            project_id: project
-          }
+      get :new, format: format, params: { namespace_id: project.namespace, project_id: project }
     end
 
     context 'when user is signed in' do
diff --git a/spec/controllers/projects/grafana_api_controller_spec.rb b/spec/controllers/projects/grafana_api_controller_spec.rb
index 90ab49f9467..ae863918d14 100644
--- a/spec/controllers/projects/grafana_api_controller_spec.rb
+++ b/spec/controllers/projects/grafana_api_controller_spec.rb
@@ -87,13 +87,15 @@ RSpec.describe Projects::GrafanaApiController, feature_category: :metrics do
       it 'returns a grafana datasource response' do
         get :proxy, params: params
 
-        expect(Grafana::ProxyService)
-          .to have_received(:new)
-          .with(project, '1', 'api/v1/query_range',
-                 { 'query' => params[:query],
-                   'start' => params[:start_time],
-                   'end' => params[:end_time],
-                   'step' => params[:step] })
+        expect(Grafana::ProxyService).to have_received(:new).with(
+          project, '1', 'api/v1/query_range',
+          {
+            'query' => params[:query],
+            'start' => params[:start_time],
+            'end' => params[:end_time],
+            'step' => params[:step]
+          }
+        )
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(json_response).to eq({})
diff --git a/spec/controllers/projects/graphs_controller_spec.rb b/spec/controllers/projects/graphs_controller_spec.rb
index 1e9d999311a..3e5bcbbc9ba 100644
--- a/spec/controllers/projects/graphs_controller_spec.rb
+++ b/spec/controllers/projects/graphs_controller_spec.rb
@@ -141,7 +141,6 @@ RSpec.describe Projects::GraphsController do
         end
 
         let(:request_params) { { namespace_id: project.namespace.path, project_id: project.path, id: 'master' } }
-        let(:feature_flag_name) { :route_hll_to_snowplow_phase2 }
         let(:category) { described_class.name }
         let(:action) { 'perform_analytics_usage_action' }
         let(:namespace) { project.namespace }
diff --git a/spec/controllers/projects/group_links_controller_spec.rb b/spec/controllers/projects/group_links_controller_spec.rb
index a5c00d24e30..2075dd3e7a7 100644
--- a/spec/controllers/projects/group_links_controller_spec.rb
+++ b/spec/controllers/projects/group_links_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Projects::GroupLinksController, feature_category: :authentication_and_authorization do
+RSpec.describe Projects::GroupLinksController, feature_category: :system_access do
   let_it_be(:group) { create(:group, :private) }
   let_it_be(:group2) { create(:group, :private) }
   let_it_be(:project) { create(:project, :private, group: group2) }
diff --git a/spec/controllers/projects/hooks_controller_spec.rb b/spec/controllers/projects/hooks_controller_spec.rb
index 815370d428d..c056e7a33aa 100644
--- a/spec/controllers/projects/hooks_controller_spec.rb
+++ b/spec/controllers/projects/hooks_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Projects::HooksController do
+RSpec.describe Projects::HooksController, feature_category: :integrations do
   include AfterNextHelpers
 
   let_it_be(:project) { create(:project) }
@@ -173,6 +173,16 @@ RSpec.describe Projects::HooksController do
     let(:params) { { namespace_id: project.namespace, project_id: project, id: hook } }
 
     it_behaves_like 'Web hook destroyer'
+
+    context 'when user does not have permission' do
+      let(:user) { create(:user, developer_projects: [project]) }
+
+      it 'renders a 404' do
+        delete :destroy, params: params
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
   end
 
   describe '#test' do
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 9c272872a73..f1fe1940414 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -183,18 +183,6 @@ RSpec.describe Projects::IssuesController, feature_category: :team_planning do
       let_it_be(:task) { create(:issue, :task, project: project) }
 
       shared_examples 'redirects to show work item page' do
-        context 'when use_iid_in_work_items_path feature flag is disabled' do
-          before do
-            stub_feature_flags(use_iid_in_work_items_path: false)
-          end
-
-          it 'redirects to work item page' do
-            make_request
-
-            expect(response).to redirect_to(project_work_items_path(project, task.id, query))
-          end
-        end
-
         it 'redirects to work item page using iid' do
           make_request
 
@@ -585,15 +573,13 @@ RSpec.describe Projects::IssuesController, feature_category: :team_planning do
     end
 
     def reorder_issue(issue, move_after_id: nil, move_before_id: nil)
-      put :reorder,
-           params: {
-               namespace_id: project.namespace.to_param,
-               project_id: project,
-               id: issue.iid,
-               move_after_id: move_after_id,
-               move_before_id: move_before_id
-           },
-           format: :json
+      put :reorder, params: {
+        namespace_id: project.namespace.to_param,
+        project_id: project,
+        id: issue.iid,
+        move_after_id: move_after_id,
+        move_before_id: move_before_id
+      }, format: :json
     end
   end
 
@@ -601,14 +587,12 @@ RSpec.describe Projects::IssuesController, feature_category: :team_planning do
     let(:issue_params) { { title: 'New title' } }
 
     subject do
-      put :update,
-        params: {
-          namespace_id: project.namespace,
-          project_id: project,
-          id: issue.to_param,
-          issue: issue_params
-        },
-        format: :json
+      put :update, params: {
+        namespace_id: project.namespace,
+        project_id: project,
+        id: issue.to_param,
+        issue: issue_params
+      }, format: :json
     end
 
     before do
@@ -1927,12 +1911,11 @@ RSpec.describe Projects::IssuesController, feature_category: :team_planning do
       end
 
       it 'redirects from an old issue/designs correctly' do
-        get :designs,
-            params: {
-              namespace_id: project.namespace,
-              project_id: project,
-              id: issue
-            }
+        get :designs, params: {
+          namespace_id: project.namespace,
+          project_id: project,
+          id: issue
+        }
 
         expect(response).to redirect_to(designs_project_issue_path(new_project, issue))
         expect(response).to have_gitlab_http_status(:moved_permanently)
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb
index 2d047957430..2e29d87dadd 100644
--- a/spec/controllers/projects/jobs_controller_spec.rb
+++ b/spec/controllers/projects/jobs_controller_spec.rb
@@ -106,9 +106,10 @@ RSpec.describe Projects::JobsController, :clean_gitlab_redis_shared_state, featu
       def create_job(name, status)
         user = create(:user)
         pipeline = create(:ci_pipeline, project: project, user: user)
-        create(:ci_build, :tags, :triggered, :artifacts,
-               pipeline: pipeline, name: name, status: status,
-               user: user)
+        create(
+          :ci_build, :tags, :triggered, :artifacts,
+          pipeline: pipeline, name: name, status: status, user: user
+        )
       end
     end
 
@@ -832,8 +833,7 @@ RSpec.describe Projects::JobsController, :clean_gitlab_redis_shared_state, featu
           retried_build = Ci::Build.last
 
           Ci::Build.clone_accessors.each do |accessor|
-            expect(job.read_attribute(accessor))
-              .to eq(retried_build.read_attribute(accessor)),
+            expect(job.read_attribute(accessor)).to eq(retried_build.read_attribute(accessor)),
               "Mismatched attribute on \"#{accessor}\". " \
               "It was \"#{job.read_attribute(accessor)}\" but changed to \"#{retried_build.read_attribute(accessor)}\""
           end
@@ -855,10 +855,10 @@ RSpec.describe Projects::JobsController, :clean_gitlab_redis_shared_state, featu
 
     def post_retry
       post :retry, params: {
-                     namespace_id: project.namespace,
-                     project_id: project,
-                     id: job.id
-                   }
+        namespace_id: project.namespace,
+        project_id: project,
+        id: job.id
+      }
     end
   end
 
@@ -869,8 +869,7 @@ RSpec.describe Projects::JobsController, :clean_gitlab_redis_shared_state, featu
     before do
       project.add_developer(user)
 
-      create(:protected_branch, :developers_can_merge,
-             name: 'protected-branch', project: project)
+      create(:protected_branch, :developers_can_merge, name: 'protected-branch', project: project)
 
       sign_in(user)
     end
diff --git a/spec/controllers/projects/mattermosts_controller_spec.rb b/spec/controllers/projects/mattermosts_controller_spec.rb
index 19a04654114..b5092a0f091 100644
--- a/spec/controllers/projects/mattermosts_controller_spec.rb
+++ b/spec/controllers/projects/mattermosts_controller_spec.rb
@@ -19,11 +19,10 @@ RSpec.describe Projects::MattermostsController do
     end
 
     it 'accepts the request' do
-      get(:new,
-          params: {
-            namespace_id: project.namespace.to_param,
-            project_id: project
-          })
+      get :new, params: {
+        namespace_id: project.namespace.to_param,
+        project_id: project
+      }
 
       expect(response).to have_gitlab_http_status(:ok)
     end
@@ -33,12 +32,11 @@ RSpec.describe Projects::MattermostsController do
     let(:mattermost_params) { { trigger: 'http://localhost:3000/trigger', team_id: 'abc' } }
 
     subject do
-      post(:create,
-           params: {
-             namespace_id: project.namespace.to_param,
-             project_id: project,
-             mattermost: mattermost_params
-           })
+      post :create, params: {
+        namespace_id: project.namespace.to_param,
+        project_id: project,
+        mattermost: mattermost_params
+      }
     end
 
     context 'no request can be made to mattermost' do
diff --git a/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb b/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb
index 311af26abf6..356741fc4e2 100644
--- a/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb
@@ -22,13 +22,11 @@ RSpec.describe Projects::MergeRequests::ConflictsController do
         allow(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter)
           .to receive(:track_loading_conflict_ui_action)
 
-        get :show,
-            params: {
-              namespace_id: merge_request_with_conflicts.project.namespace.to_param,
-              project_id: merge_request_with_conflicts.project,
-              id: merge_request_with_conflicts.iid
-            },
-            format: 'html'
+        get :show, params: {
+          namespace_id: merge_request_with_conflicts.project.namespace.to_param,
+          project_id: merge_request_with_conflicts.project,
+          id: merge_request_with_conflicts.iid
+        }, format: 'html'
       end
 
       it 'does tracks the resolve call' do
@@ -45,13 +43,11 @@ RSpec.describe Projects::MergeRequests::ConflictsController do
         allow(Gitlab::Git::Conflict::Parser).to receive(:parse)
           .and_raise(Gitlab::Git::Conflict::Parser::UnmergeableFile)
 
-        get :show,
-            params: {
-              namespace_id: merge_request_with_conflicts.project.namespace.to_param,
-              project_id: merge_request_with_conflicts.project,
-              id: merge_request_with_conflicts.iid
-            },
-            format: 'json'
+        get :show, params: {
+          namespace_id: merge_request_with_conflicts.project.namespace.to_param,
+          project_id: merge_request_with_conflicts.project,
+          id: merge_request_with_conflicts.iid
+        }, format: 'json'
       end
 
       it 'returns a 200 status code' do
@@ -70,13 +66,11 @@ RSpec.describe Projects::MergeRequests::ConflictsController do
 
     context 'with valid conflicts' do
       before do
-        get :show,
-            params: {
-              namespace_id: merge_request_with_conflicts.project.namespace.to_param,
-              project_id: merge_request_with_conflicts.project,
-              id: merge_request_with_conflicts.iid
-            },
-            format: 'json'
+        get :show, params: {
+          namespace_id: merge_request_with_conflicts.project.namespace.to_param,
+          project_id: merge_request_with_conflicts.project,
+          id: merge_request_with_conflicts.iid
+        }, format: 'json'
       end
 
       it 'matches the schema' do
@@ -130,15 +124,13 @@ RSpec.describe Projects::MergeRequests::ConflictsController do
 
   describe 'GET conflict_for_path' do
     def conflict_for_path(path)
-      get :conflict_for_path,
-          params: {
-            namespace_id: merge_request_with_conflicts.project.namespace.to_param,
-            project_id: merge_request_with_conflicts.project,
-            id: merge_request_with_conflicts.iid,
-            old_path: path,
-            new_path: path
-          },
-          format: 'json'
+      get :conflict_for_path, params: {
+        namespace_id: merge_request_with_conflicts.project.namespace.to_param,
+        project_id: merge_request_with_conflicts.project,
+        id: merge_request_with_conflicts.iid,
+        old_path: path,
+        new_path: path
+      }, format: 'json'
     end
 
     context 'when the conflicts cannot be resolved in the UI' do
@@ -178,11 +170,13 @@ RSpec.describe Projects::MergeRequests::ConflictsController do
 
         aggregate_failures do
           expect(response).to have_gitlab_http_status(:ok)
-          expect(json_response).to include('old_path' => path,
-                                           'new_path' => path,
-                                           'blob_icon' => 'doc-text',
-                                           'blob_path' => a_string_ending_with(path),
-                                           'content' => content)
+          expect(json_response).to include(
+            'old_path' => path,
+            'new_path' => path,
+            'blob_icon' => 'doc-text',
+            'blob_path' => a_string_ending_with(path),
+            'content' => content
+          )
         end
       end
     end
@@ -197,15 +191,13 @@ RSpec.describe Projects::MergeRequests::ConflictsController do
     end
 
     def resolve_conflicts(files)
-      post :resolve_conflicts,
-           params: {
-             namespace_id: merge_request_with_conflicts.project.namespace.to_param,
-             project_id: merge_request_with_conflicts.project,
-             id: merge_request_with_conflicts.iid,
-             files: files,
-             commit_message: 'Commit message'
-           },
-           format: 'json'
+      post :resolve_conflicts, params: {
+        namespace_id: merge_request_with_conflicts.project.namespace.to_param,
+        project_id: merge_request_with_conflicts.project,
+        id: merge_request_with_conflicts.iid,
+        files: files,
+        commit_message: 'Commit message'
+      }, format: 'json'
     end
 
     context 'with valid params' do
diff --git a/spec/controllers/projects/merge_requests/creations_controller_spec.rb b/spec/controllers/projects/merge_requests/creations_controller_spec.rb
index 3d4a884587f..c6a4dcbfdf0 100644
--- a/spec/controllers/projects/merge_requests/creations_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/creations_controller_spec.rb
@@ -99,9 +99,7 @@ RSpec.describe Projects::MergeRequests::CreationsController, feature_category: :
 
   describe 'GET pipelines' do
     before do
-      create(:ci_pipeline, sha: fork_project.commit('remove-submodule').id,
-                           ref: 'remove-submodule',
-                           project: fork_project)
+      create(:ci_pipeline, sha: fork_project.commit('remove-submodule').id, ref: 'remove-submodule', project: fork_project)
     end
 
     it 'renders JSON including serialized pipelines' do
@@ -188,13 +186,12 @@ RSpec.describe Projects::MergeRequests::CreationsController, feature_category: :
       expect(Ability).to receive(:allowed?).with(user, :read_project, project) { true }
       expect(Ability).to receive(:allowed?).with(user, :create_merge_request_in, project) { true }.at_least(:once)
 
-      get :branch_to,
-          params: {
-            namespace_id: fork_project.namespace,
-            project_id: fork_project,
-            target_project_id: project.id,
-            ref: 'master'
-          }
+      get :branch_to, params: {
+        namespace_id: fork_project.namespace,
+        project_id: fork_project,
+        target_project_id: project.id,
+        ref: 'master'
+      }
 
       expect(assigns(:commit)).not_to be_nil
       expect(response).to have_gitlab_http_status(:ok)
@@ -204,13 +201,12 @@ RSpec.describe Projects::MergeRequests::CreationsController, feature_category: :
       expect(Ability).to receive(:allowed?).with(user, :read_project, project) { true }
       expect(Ability).to receive(:allowed?).with(user, :create_merge_request_in, project) { false }.at_least(:once)
 
-      get :branch_to,
-          params: {
-            namespace_id: fork_project.namespace,
-            project_id: fork_project,
-            target_project_id: project.id,
-            ref: 'master'
-          }
+      get :branch_to, params: {
+        namespace_id: fork_project.namespace,
+        project_id: fork_project,
+        target_project_id: project.id,
+        ref: 'master'
+      }
 
       expect(assigns(:commit)).to be_nil
       expect(response).to have_gitlab_http_status(:ok)
@@ -220,13 +216,12 @@ RSpec.describe Projects::MergeRequests::CreationsController, feature_category: :
       expect(Ability).to receive(:allowed?).with(user, :read_project, project) { false }
       expect(Ability).to receive(:allowed?).with(user, :create_merge_request_in, project) { true }.at_least(:once)
 
-      get :branch_to,
-          params: {
-            namespace_id: fork_project.namespace,
-            project_id: fork_project,
-            target_project_id: project.id,
-            ref: 'master'
-          }
+      get :branch_to, params: {
+        namespace_id: fork_project.namespace,
+        project_id: fork_project,
+        target_project_id: project.id,
+        ref: 'master'
+      }
 
       expect(assigns(:commit)).to be_nil
       expect(response).to have_gitlab_http_status(:ok)
diff --git a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
index 23a33d7e0b1..a5dc351201d 100644
--- a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb
@@ -247,9 +247,11 @@ RSpec.describe Projects::MergeRequests::DiffsController, feature_category: :code
                 straight: true)
             end
 
-            go(diff_head: true,
-               diff_id: merge_request.merge_request_diff.id,
-               start_sha: merge_request.merge_request_diff.start_commit_sha)
+            go(
+              diff_head: true,
+              diff_id: merge_request.merge_request_diff.id,
+              start_sha: merge_request.merge_request_diff.start_commit_sha
+            )
           end
         end
       end
@@ -329,9 +331,11 @@ RSpec.describe Projects::MergeRequests::DiffsController, feature_category: :code
             diff_for_path(old_path: existing_path, new_path: existing_path)
 
             expect(assigns(:diff_notes_disabled)).to be_falsey
-            expect(assigns(:new_diff_note_attrs)).to eq(noteable_type: 'MergeRequest',
-                                                        noteable_id: merge_request.id,
-                                                        commit_id: nil)
+            expect(assigns(:new_diff_note_attrs)).to eq(
+              noteable_type: 'MergeRequest',
+              noteable_id: merge_request.id,
+              commit_id: nil
+            )
           end
 
           it 'only renders the diffs for the path given' do
@@ -528,8 +532,7 @@ RSpec.describe Projects::MergeRequests::DiffsController, feature_category: :code
 
     context 'with diff_id and start_sha params' do
       subject do
-        go(diff_id: merge_request.merge_request_diff.id,
-           start_sha: merge_request.merge_request_diff.start_commit_sha)
+        go(diff_id: merge_request.merge_request_diff.id, start_sha: merge_request.merge_request_diff.start_commit_sha)
       end
 
       it_behaves_like 'serializes diffs with expected arguments' do
diff --git a/spec/controllers/projects/merge_requests/drafts_controller_spec.rb b/spec/controllers/projects/merge_requests/drafts_controller_spec.rb
index 39482938a8b..6632473a85c 100644
--- a/spec/controllers/projects/merge_requests/drafts_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests/drafts_controller_spec.rb
@@ -299,8 +299,7 @@ RSpec.describe Projects::MergeRequests::DraftsController do
 
     it 'publishes a draft note with quick actions and applies them', :sidekiq_inline do
       project.add_developer(user2)
-      create(:draft_note, merge_request: merge_request, author: user,
-                          note: "/assign #{user2.to_reference}")
+      create(:draft_note, merge_request: merge_request, author: user, note: "/assign #{user2.to_reference}")
 
       expect(merge_request.assignees).to be_empty
 
@@ -350,12 +349,13 @@ RSpec.describe Projects::MergeRequests::DraftsController do
       let(:note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) }
 
       def create_reply(discussion_id, resolves: false)
-        create(:draft_note,
-               merge_request: merge_request,
-               author: user,
-               discussion_id: discussion_id,
-               resolve_discussion: resolves
-              )
+        create(
+          :draft_note,
+          merge_request: merge_request,
+          author: user,
+          discussion_id: discussion_id,
+          resolve_discussion: resolves
+        )
       end
 
       it 'resolves a thread if the draft note resolves it' do
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index ceb3f803db5..9e18089bb23 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -210,9 +210,7 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review
           diff = merge_request.merge_request_diff
 
           diff.clean!
-          diff.update!(real_size: nil,
-                       start_commit_sha: nil,
-                       base_commit_sha: nil)
+          diff.update!(real_size: nil, start_commit_sha: nil, base_commit_sha: nil)
 
           go(format: :html)
 
@@ -270,24 +268,22 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review
         end
 
         it 'redirects from an old merge request correctly' do
-          get :show,
-              params: {
-                namespace_id: project.namespace,
-                project_id: project,
-                id: merge_request
-              }
+          get :show, params: {
+            namespace_id: project.namespace,
+            project_id: project,
+            id: merge_request
+          }
 
           expect(response).to redirect_to(project_merge_request_path(new_project, merge_request))
           expect(response).to have_gitlab_http_status(:moved_permanently)
         end
 
         it 'redirects from an old merge request commits correctly' do
-          get :commits,
-              params: {
-                namespace_id: project.namespace,
-                project_id: project,
-                id: merge_request
-              }
+          get :commits, params: {
+            namespace_id: project.namespace,
+            project_id: project,
+            id: merge_request
+          }
 
           expect(response).to redirect_to(commits_project_merge_request_path(new_project, merge_request))
           expect(response).to have_gitlab_http_status(:moved_permanently)
@@ -385,13 +381,12 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review
     let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) }
 
     def get_merge_requests(page = nil)
-      get :index,
-          params: {
-            namespace_id: project.namespace.to_param,
-            project_id: project,
-            state: 'opened',
-            page: page.to_param
-          }
+      get :index, params: {
+        namespace_id: project.namespace.to_param,
+        project_id: project,
+        state: 'opened',
+        page: page.to_param
+      }
     end
 
     it_behaves_like "issuables list meta-data", :merge_request
@@ -842,15 +837,13 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review
 
   describe 'GET commits' do
     def go(page: nil, per_page: 1, format: 'html')
-      get :commits,
-          params: {
-            namespace_id: project.namespace.to_param,
-            project_id: project,
-            id: merge_request.iid,
-            page: page,
-            per_page: per_page
-          },
-          format: format
+      get :commits, params: {
+        namespace_id: project.namespace.to_param,
+        project_id: project,
+        id: merge_request.iid,
+        page: page,
+        per_page: per_page
+      }, format: format
     end
 
     it 'renders the commits template to a string' do
@@ -884,17 +877,18 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review
 
   describe 'GET pipelines' do
     before do
-      create(:ci_pipeline, project: merge_request.source_project,
-                           ref: merge_request.source_branch,
-                           sha: merge_request.diff_head_sha)
+      create(
+        :ci_pipeline,
+        project: merge_request.source_project,
+        ref: merge_request.source_branch,
+        sha: merge_request.diff_head_sha
+      )
 
-      get :pipelines,
-          params: {
-            namespace_id: project.namespace.to_param,
-            project_id: project,
-            id: merge_request.iid
-          },
-          format: :json
+      get :pipelines, params: {
+        namespace_id: project.namespace.to_param,
+        project_id: project,
+        id: merge_request.iid
+      }, format: :json
     end
 
     context 'with "enabled" builds on a public project' do
@@ -1955,17 +1949,18 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review
     let(:issue2) { create(:issue, project: project) }
 
     def post_assign_issues
-      merge_request.update!(description: "Closes #{issue1.to_reference} and #{issue2.to_reference}",
-                            author: user,
-                            source_branch: 'feature',
-                            target_branch: 'master')
+      merge_request.update!(
+        description: "Closes #{issue1.to_reference} and #{issue2.to_reference}",
+        author: user,
+        source_branch: 'feature',
+        target_branch: 'master'
+      )
 
-      post :assign_related_issues,
-           params: {
-             namespace_id: project.namespace.to_param,
-             project_id: project,
-             id: merge_request.iid
-           }
+      post :assign_related_issues, params: {
+        namespace_id: project.namespace.to_param,
+        project_id: project,
+        id: merge_request.iid
+      }
     end
 
     it 'displays an flash error message on fail' do
@@ -2143,10 +2138,13 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review
   describe 'GET pipeline_status.json' do
     context 'when head_pipeline exists' do
       let!(:pipeline) do
-        create(:ci_pipeline, project: merge_request.source_project,
-                             ref: merge_request.source_branch,
-                             sha: merge_request.diff_head_sha,
-                             head_pipeline_of: merge_request)
+        create(
+          :ci_pipeline,
+          project: merge_request.source_project,
+          ref: merge_request.source_branch,
+          sha: merge_request.diff_head_sha,
+          head_pipeline_of: merge_request
+        )
       end
 
       let(:status) { pipeline.detailed_status(double('user')) }
@@ -2199,11 +2197,10 @@ RSpec.describe Projects::MergeRequestsController, feature_category: :code_review
 
     def get_pipeline_status
       get :pipeline_status, params: {
-                              namespace_id: project.namespace,
-                              project_id: project,
-                              id: merge_request.iid
-                            },
-                            format: :json
+        namespace_id: project.namespace,
+        project_id: project,
+        id: merge_request.iid
+      }, format: :json
     end
   end
 
diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb
index 23b0b58158f..5e4e47be2c5 100644
--- a/spec/controllers/projects/notes_controller_spec.rb
+++ b/spec/controllers/projects/notes_controller_spec.rb
@@ -37,6 +37,8 @@ RSpec.describe Projects::NotesController, type: :controller, feature_category: :
       project.add_developer(user)
     end
 
+    specify { expect(get(:index, params: request_params)).to have_request_urgency(:medium) }
+
     it 'passes last_fetched_at from headers to NotesFinder and MergeIntoNotesService' do
       last_fetched_at = Time.zone.at(3.hours.ago.to_i) # remove nanoseconds
 
@@ -244,6 +246,8 @@ RSpec.describe Projects::NotesController, type: :controller, feature_category: :
       sign_in(user)
     end
 
+    specify { expect(create!).to have_request_urgency(:low) }
+
     describe 'making the creation request' do
       before do
         create!
@@ -432,6 +436,13 @@ RSpec.describe Projects::NotesController, type: :controller, feature_category: :
             expect(json_response['commands_changes']).to include('emoji_award', 'time_estimate', 'spend_time')
             expect(json_response['commands_changes']).not_to include('target_project', 'title')
           end
+
+          it 'includes command_names' do
+            create!
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(json_response['command_names']).to include('award', 'estimate', 'spend')
+          end
         end
 
         context 'with commands that do not return changes' do
@@ -450,6 +461,13 @@ RSpec.describe Projects::NotesController, type: :controller, feature_category: :
             expect(response).to have_gitlab_http_status(:ok)
             expect(json_response['commands_changes']).not_to include('target_project', 'title')
           end
+
+          it 'includes command_names' do
+            create!
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(json_response['command_names']).to include('move', 'title')
+          end
         end
       end
     end
@@ -484,10 +502,7 @@ RSpec.describe Projects::NotesController, type: :controller, feature_category: :
         let(:commit) { create(:commit, project: project) }
 
         let(:existing_comment) do
-          create(:note_on_commit,
-                 note: 'first',
-                 project: project,
-                 commit_id: merge_request.commit_shas.first)
+          create(:note_on_commit, note: 'first', project: project, commit_id: merge_request.commit_shas.first)
         end
 
         let(:discussion) { existing_comment.discussion }
@@ -735,19 +750,21 @@ RSpec.describe Projects::NotesController, type: :controller, feature_category: :
   end
 
   describe 'PUT update' do
-    context "should update the note with a valid issue" do
-      let(:request_params) do
-        {
-          namespace_id: project.namespace,
-          project_id: project,
-          id: note,
-          format: :json,
-          note: {
-            note: "New comment"
-          }
+    let(:request_params) do
+      {
+        namespace_id: project.namespace,
+        project_id: project,
+        id: note,
+        format: :json,
+        note: {
+          note: "New comment"
         }
-      end
+      }
+    end
+
+    specify { expect(put(:update, params: request_params)).to have_request_urgency(:low) }
 
+    context "should update the note with a valid issue" do
       before do
         sign_in(note.author)
         project.add_developer(note.author)
@@ -793,6 +810,8 @@ RSpec.describe Projects::NotesController, type: :controller, feature_category: :
       }
     end
 
+    specify { expect(delete(:destroy, params: request_params)).to have_request_urgency(:low) }
+
     context 'user is the author of a note' do
       before do
         sign_in(note.author)
@@ -834,6 +853,8 @@ RSpec.describe Projects::NotesController, type: :controller, feature_category: :
 
     let(:emoji_name) { 'thumbsup' }
 
+    it { is_expected.to have_request_urgency(:low) }
+
     it "toggles the award emoji" do
       expect do
         subject
@@ -869,6 +890,8 @@ RSpec.describe Projects::NotesController, type: :controller, feature_category: :
         sign_in user
       end
 
+      specify { expect(post(:resolve, params: request_params)).to have_request_urgency(:low) }
+
       context "when the user is not authorized to resolve the note" do
         it "returns status 404" do
           post :resolve, params: request_params
@@ -932,6 +955,8 @@ RSpec.describe Projects::NotesController, type: :controller, feature_category: :
         note.resolve!(user)
       end
 
+      specify { expect(delete(:unresolve, params: request_params)).to have_request_urgency(:low) }
+
       context "when the user is not authorized to resolve the note" do
         it "returns status 404" do
           delete :unresolve, params: request_params
@@ -1001,6 +1026,8 @@ RSpec.describe Projects::NotesController, type: :controller, feature_category: :
       expect(json_response.count).to eq(1)
       expect(json_response.first).to include({ "line_text" => "Test" })
     end
+
+    specify { expect(get(:outdated_line_change, params: request_params)).to have_request_urgency(:low) }
   end
 
   # Convert a time to an integer number of microseconds
diff --git a/spec/controllers/projects/pages_controller_spec.rb b/spec/controllers/projects/pages_controller_spec.rb
index 136f98ac907..ded5dd57e3e 100644
--- a/spec/controllers/projects/pages_controller_spec.rb
+++ b/spec/controllers/projects/pages_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Projects::PagesController do
+RSpec.describe Projects::PagesController, feature_category: :pages do
   let(:user) { create(:user) }
   let(:project) { create(:project, :public) }
 
@@ -14,7 +14,12 @@ RSpec.describe Projects::PagesController do
   end
 
   before do
-    allow(Gitlab.config.pages).to receive(:enabled).and_return(true)
+    stub_config(pages: {
+      enabled: true,
+      external_https: true,
+      access_control: false
+    })
+
     sign_in(user)
     project.add_maintainer(user)
   end
@@ -123,49 +128,99 @@ RSpec.describe Projects::PagesController do
   end
 
   describe 'PATCH update' do
-    let(:request_params) do
-      {
-        namespace_id: project.namespace,
-        project_id: project,
-        project: { pages_https_only: 'false' }
-      }
-    end
+    context 'when updating pages_https_only' do
+      let(:request_params) do
+        {
+          namespace_id: project.namespace,
+          project_id: project,
+          project: { pages_https_only: 'true' }
+        }
+      end
 
-    let(:update_service) { double(execute: { status: :success }) }
+      it 'updates project field and redirects back to the pages settings' do
+        project.update!(pages_https_only: false)
 
-    before do
-      allow(Projects::UpdateService).to receive(:new) { update_service }
-    end
+        expect { patch :update, params: request_params }
+          .to change { project.reload.pages_https_only }
+          .from(false).to(true)
 
-    it 'returns 302 status' do
-      patch :update, params: request_params
+        expect(response).to have_gitlab_http_status(:found)
+        expect(response).to redirect_to(project_pages_path(project))
+      end
 
-      expect(response).to have_gitlab_http_status(:found)
-    end
+      context 'when it fails to update' do
+        it 'adds an error message' do
+          expect_next_instance_of(Projects::UpdateService) do |service|
+            expect(service)
+              .to receive(:execute)
+              .and_return(status: :error, message: 'some error happened')
+          end
 
-    it 'redirects back to the pages settings' do
-      patch :update, params: request_params
+          expect { patch :update, params: request_params }
+            .not_to change { project.reload.pages_https_only }
 
-      expect(response).to redirect_to(project_pages_path(project))
+          expect(response).to redirect_to(project_pages_path(project))
+          expect(flash[:alert]).to eq('some error happened')
+        end
+      end
     end
 
-    it 'calls the update service' do
-      expect(Projects::UpdateService)
-        .to receive(:new)
-        .with(project, user, ActionController::Parameters.new(request_params[:project]).permit!)
-        .and_return(update_service)
+    context 'when updating pages_unique_domain' do
+      let(:request_params) do
+        {
+          namespace_id: project.namespace,
+          project_id: project,
+          project: {
+            project_setting_attributes: {
+              pages_unique_domain_enabled: 'true'
+            }
+          }
+        }
+      end
 
-      patch :update, params: request_params
-    end
+      before do
+        create(:project_setting, project: project, pages_unique_domain_enabled: false)
+      end
 
-    context 'when update_service returns an error message' do
-      let(:update_service) { double(execute: { status: :error, message: 'some error happened' }) }
+      context 'with pages_unique_domain feature flag disabled' do
+        it 'does not update pages unique domain' do
+          stub_feature_flags(pages_unique_domain: false)
 
-      it 'adds an error message' do
-        patch :update, params: request_params
+          expect { patch :update, params: request_params }
+            .not_to change { project.project_setting.reload.pages_unique_domain_enabled }
+        end
+      end
 
-        expect(response).to redirect_to(project_pages_path(project))
-        expect(flash[:alert]).to eq('some error happened')
+      context 'with pages_unique_domain feature flag enabled' do
+        before do
+          stub_feature_flags(pages_unique_domain: true)
+        end
+
+        it 'updates pages_https_only and pages_unique_domain and redirects back to pages settings' do
+          expect { patch :update, params: request_params }
+            .to change { project.project_setting.reload.pages_unique_domain_enabled }
+            .from(false).to(true)
+
+          expect(project.project_setting.pages_unique_domain).not_to be_nil
+          expect(response).to have_gitlab_http_status(:found)
+          expect(response).to redirect_to(project_pages_path(project))
+        end
+
+        context 'when it fails to update' do
+          it 'adds an error message' do
+            expect_next_instance_of(Projects::UpdateService) do |service|
+              expect(service)
+                .to receive(:execute)
+                .and_return(status: :error, message: 'some error happened')
+            end
+
+            expect { patch :update, params: request_params }
+              .not_to change { project.project_setting.reload.pages_unique_domain_enabled }
+
+            expect(response).to redirect_to(project_pages_path(project))
+            expect(flash[:alert]).to eq('some error happened')
+          end
+        end
       end
     end
   end
diff --git a/spec/controllers/projects/pipeline_schedules_controller_spec.rb b/spec/controllers/projects/pipeline_schedules_controller_spec.rb
index a628c1ab230..6d810fdcd51 100644
--- a/spec/controllers/projects/pipeline_schedules_controller_spec.rb
+++ b/spec/controllers/projects/pipeline_schedules_controller_spec.rb
@@ -410,9 +410,9 @@ RSpec.describe Projects::PipelineSchedulesController, feature_category: :continu
       it { expect { go }.to be_denied_for(:visitor) }
 
       context 'when user is schedule owner' do
-        it { expect { go }.to be_denied_for(:owner).of(project).own(pipeline_schedule) }
-        it { expect { go }.to be_denied_for(:maintainer).of(project).own(pipeline_schedule) }
-        it { expect { go }.to be_denied_for(:developer).of(project).own(pipeline_schedule) }
+        it { expect { go }.to be_allowed_for(:owner).of(project).own(pipeline_schedule) }
+        it { expect { go }.to be_allowed_for(:maintainer).of(project).own(pipeline_schedule) }
+        it { expect { go }.to be_allowed_for(:developer).of(project).own(pipeline_schedule) }
         it { expect { go }.to be_denied_for(:reporter).of(project).own(pipeline_schedule) }
         it { expect { go }.to be_denied_for(:guest).of(project).own(pipeline_schedule) }
         it { expect { go }.to be_denied_for(:user).own(pipeline_schedule) }
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb
index 4e0c098ad81..09b703a48d6 100644
--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -199,22 +199,36 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
           check_pipeline_response(returned: 6, all: 6)
         end
       end
+
+      context "with lazy_load_pipeline_dropdown_actions feature flag disabled" do
+        before do
+          stub_feature_flags(lazy_load_pipeline_dropdown_actions: false)
+        end
+
+        it 'returns manual and scheduled actions' do
+          get_pipelines_index_json
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to match_response_schema('pipeline')
+
+          expect(json_response.dig('pipelines', 0, 'details')).to include('manual_actions')
+          expect(json_response.dig('pipelines', 0, 'details')).to include('scheduled_actions')
+        end
+      end
     end
 
     def get_pipelines_index_html(params = {})
       get :index, params: {
-                    namespace_id: project.namespace,
-                    project_id: project
-                  }.merge(params),
-                  format: :html
+        namespace_id: project.namespace,
+        project_id: project
+      }.merge(params), format: :html
     end
 
     def get_pipelines_index_json(params = {})
       get :index, params: {
-                    namespace_id: project.namespace,
-                    project_id: project
-                  }.merge(params),
-                  format: :json
+        namespace_id: project.namespace,
+        project_id: project
+      }.merge(params), format: :json
     end
 
     def create_all_pipeline_types
@@ -236,12 +250,15 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
 
     def create_pipeline(status, sha, merge_request: nil)
       user = create(:user)
-      pipeline = create(:ci_empty_pipeline, status: status,
-                                            project: project,
-                                            sha: sha.id,
-                                            ref: sha.id.first(8),
-                                            user: user,
-                                            merge_request: merge_request)
+      pipeline = create(
+        :ci_empty_pipeline,
+        status: status,
+        project: project,
+        sha: sha.id,
+        ref: sha.id.first(8),
+        user: user,
+        merge_request: merge_request
+      )
 
       build_stage = create(:ci_stage, name: 'build', pipeline: pipeline)
       test_stage = create(:ci_stage, name: 'test', pipeline: pipeline)
@@ -378,9 +395,7 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
       let(:project) { create(:project, :repository) }
 
       let(:pipeline) do
-        create(:ci_empty_pipeline, project: project,
-                                   user: user,
-                                   sha: project.commit.id)
+        create(:ci_empty_pipeline, project: project, user: user, sha: project.commit.id)
       end
 
       let(:build_stage) { create(:ci_stage, name: 'build', pipeline: pipeline) }
@@ -598,9 +613,7 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
 
       def create_pipeline(project)
         create(:ci_empty_pipeline, project: project).tap do |pipeline|
-          create(:ci_build, pipeline: pipeline,
-                            ci_stage: create(:ci_stage, name: 'test', pipeline: pipeline),
-                            name: 'rspec')
+          create(:ci_build, pipeline: pipeline, ci_stage: create(:ci_stage, name: 'test', pipeline: pipeline), name: 'rspec')
         end
       end
 
@@ -771,11 +784,8 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
 
     before do
       get :status, params: {
-                     namespace_id: project.namespace,
-                     project_id: project,
-                     id: pipeline.id
-                   },
-                   format: :json
+        namespace_id: project.namespace, project_id: project, id: pipeline.id
+      }, format: :json
     end
 
     it 'return a detailed pipeline status in json' do
@@ -825,7 +835,6 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
         subject { get :charts, params: request_params, format: :html }
 
         let(:request_params) { { namespace_id: project.namespace, project_id: project, id: pipeline.id, chart: tab[:chart_param] } }
-        let(:feature_flag_name) { :route_hll_to_snowplow_phase2 }
         let(:category) { described_class.name }
         let(:action) { 'perform_analytics_usage_action' }
         let(:namespace) { project.namespace }
@@ -868,9 +877,7 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
 
       context 'when latest commit contains [ci skip]' do
         before do
-          project.repository.create_file(user, 'new-file.txt', 'A new file',
-                                         message: '[skip ci] This is a test',
-                                         branch_name: 'master')
+          project.repository.create_file(user, 'new-file.txt', 'A new file', message: '[skip ci] This is a test', branch_name: 'master')
         end
 
         it_behaves_like 'creates a pipeline'
@@ -906,11 +913,8 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
 
     subject do
       post :create, params: {
-                      namespace_id: project.namespace,
-                      project_id: project,
-                      pipeline: { ref: 'master' }
-                    },
-                    format: :json
+        namespace_id: project.namespace, project_id: project, pipeline: { ref: 'master' }
+      }, format: :json
     end
 
     before do
@@ -969,11 +973,8 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
   describe 'POST retry.json' do
     subject(:post_retry) do
       post :retry, params: {
-                     namespace_id: project.namespace,
-                     project_id: project,
-                     id: pipeline.id
-                   },
-                   format: :json
+        namespace_id: project.namespace, project_id: project, id: pipeline.id
+      }, format: :json
     end
 
     let!(:pipeline) { create(:ci_pipeline, :failed, project: project) }
@@ -1036,11 +1037,8 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
 
     before do
       post :cancel, params: {
-                      namespace_id: project.namespace,
-                      project_id: project,
-                      id: pipeline.id
-                    },
-                    format: :json
+        namespace_id: project.namespace, project_id: project, id: pipeline.id
+      }, format: :json
     end
 
     it 'cancels a pipeline without returning any content', :sidekiq_might_not_need_inline do
@@ -1192,17 +1190,11 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
     let(:branch_secondary) { project.repository.branches[1] }
 
     let!(:pipeline_master) do
-      create(:ci_pipeline,
-             ref: branch_main.name,
-             sha: branch_main.target,
-             project: project)
+      create(:ci_pipeline, ref: branch_main.name, sha: branch_main.target, project: project)
     end
 
     let!(:pipeline_secondary) do
-      create(:ci_pipeline,
-             ref: branch_secondary.name,
-             sha: branch_secondary.target,
-             project: project)
+      create(:ci_pipeline, ref: branch_secondary.name, sha: branch_secondary.target, project: project)
     end
 
     before do
@@ -1455,10 +1447,9 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte
     private
 
     def get_config_variables
-      get :config_variables, params: { namespace_id: project.namespace,
-                                       project_id: project,
-                                       sha: ref },
-                             format: :json
+      get :config_variables, params: {
+        namespace_id: project.namespace, project_id: project, sha: ref
+      }, format: :json
     end
   end
 
diff --git a/spec/controllers/projects/prometheus/alerts_controller_spec.rb b/spec/controllers/projects/prometheus/alerts_controller_spec.rb
index 09b9f25c0c6..91d3ba7e106 100644
--- a/spec/controllers/projects/prometheus/alerts_controller_spec.rb
+++ b/spec/controllers/projects/prometheus/alerts_controller_spec.rb
@@ -117,10 +117,7 @@ RSpec.describe Projects::Prometheus::AlertsController do
 
   describe 'GET #metrics_dashboard' do
     let!(:alert) do
-      create(:prometheus_alert,
-             project: project,
-             environment: environment,
-             prometheus_metric: metric)
+      create(:prometheus_alert, project: project, environment: environment, prometheus_metric: metric)
     end
 
     it 'returns a json object with the correct keys' do
diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb
index 40252cf65cd..b15a37d8d90 100644
--- a/spec/controllers/projects/raw_controller_spec.rb
+++ b/spec/controllers/projects/raw_controller_spec.rb
@@ -12,13 +12,9 @@ RSpec.describe Projects::RawController, feature_category: :source_code_managemen
 
   describe 'GET #show' do
     def get_show
-      get(:show,
-          params: {
-            namespace_id: project.namespace,
-            project_id: project,
-            id: file_path,
-            inline: inline
-          }.merge(params))
+      get :show, params: {
+        namespace_id: project.namespace, project_id: project, id: file_path, inline: inline
+      }.merge(params)
     end
 
     subject { get_show }
diff --git a/spec/controllers/projects/refs_controller_spec.rb b/spec/controllers/projects/refs_controller_spec.rb
index a0d119baf16..0b1d0b75de7 100644
--- a/spec/controllers/projects/refs_controller_spec.rb
+++ b/spec/controllers/projects/refs_controller_spec.rb
@@ -54,14 +54,9 @@ RSpec.describe Projects::RefsController, feature_category: :source_code_manageme
     let(:path) { 'foo/bar/baz.html' }
 
     def default_get(format = :html)
-      get :logs_tree,
-          params: {
-            namespace_id: project.namespace.to_param,
-            project_id: project,
-            id: 'master',
-            path: path
-          },
-          format: format
+      get :logs_tree, params: {
+        namespace_id: project.namespace.to_param, project_id: project, id: 'master', path: path
+      }, format: format
     end
 
     def xhr_get(format = :html, params = {})
diff --git a/spec/controllers/projects/registry/repositories_controller_spec.rb b/spec/controllers/projects/registry/repositories_controller_spec.rb
index 59bc1ba04e7..834fdddd583 100644
--- a/spec/controllers/projects/registry/repositories_controller_spec.rb
+++ b/spec/controllers/projects/registry/repositories_controller_spec.rb
@@ -59,8 +59,7 @@ RSpec.describe Projects::Registry::RepositoriesController do
       context 'when root container repository is not created' do
         context 'when there are tags for this repository' do
           before do
-            stub_container_registry_tags(repository: :any,
-                                         tags: %w[rc1 latest])
+            stub_container_registry_tags(repository: :any, tags: %w[rc1 latest])
           end
 
           it 'creates a root container repository' do
@@ -139,19 +138,12 @@ RSpec.describe Projects::Registry::RepositoriesController do
   end
 
   def go_to_index(format: :html, params: {})
-    get :index, params: params.merge({
-                  namespace_id: project.namespace,
-                  project_id: project
-                }),
-                format: format
+    get :index, params: params.merge({ namespace_id: project.namespace, project_id: project }), format: format
   end
 
   def delete_repository(repository)
     delete :destroy, params: {
-                       namespace_id: project.namespace,
-                       project_id: project,
-                       id: repository
-                     },
-                     format: :json
+      namespace_id: project.namespace, project_id: project, id: repository
+    }, format: :json
   end
 end
diff --git a/spec/controllers/projects/registry/tags_controller_spec.rb b/spec/controllers/projects/registry/tags_controller_spec.rb
index 7b786f4a8af..afa7bd6a60d 100644
--- a/spec/controllers/projects/registry/tags_controller_spec.rb
+++ b/spec/controllers/projects/registry/tags_controller_spec.rb
@@ -76,11 +76,8 @@ RSpec.describe Projects::Registry::TagsController do
 
     def get_tags
       get :index, params: {
-                    namespace_id: project.namespace,
-                    project_id: project,
-                    repository_id: repository
-                  },
-                  format: :json
+        namespace_id: project.namespace, project_id: project, repository_id: repository
+      }, format: :json
     end
   end
 
@@ -121,12 +118,11 @@ RSpec.describe Projects::Registry::TagsController do
 
     def destroy_tag(name)
       post :destroy, params: {
-                       namespace_id: project.namespace,
-                       project_id: project,
-                       repository_id: repository,
-                       id: name
-                     },
-                     format: :json
+        namespace_id: project.namespace,
+        project_id: project,
+        repository_id: repository,
+        id: name
+      }, format: :json
     end
   end
 
@@ -162,12 +158,11 @@ RSpec.describe Projects::Registry::TagsController do
 
     def bulk_destroy_tags(names)
       post :bulk_destroy, params: {
-                       namespace_id: project.namespace,
-                       project_id: project,
-                       repository_id: repository,
-                       ids: names
-                     },
-                          format: :json
+        namespace_id: project.namespace,
+        project_id: project,
+        repository_id: repository,
+        ids: names
+      }, format: :json
     end
   end
 
diff --git a/spec/controllers/projects/settings/ci_cd_controller_spec.rb b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
index ba917fa3a31..1c332eadc42 100644
--- a/spec/controllers/projects/settings/ci_cd_controller_spec.rb
+++ b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
@@ -173,12 +173,11 @@ RSpec.describe Projects::Settings::CiCdController, feature_category: :continuous
       let(:params) { { ci_config_path: '' } }
 
       subject do
-        patch :update,
-              params: {
-                namespace_id: project.namespace.to_param,
-                project_id: project,
-                project: params
-              }
+        patch :update, params: {
+          namespace_id: project.namespace.to_param,
+          project_id: project,
+          project: params
+        }
       end
 
       it 'redirects to the settings page' do
@@ -241,9 +240,7 @@ RSpec.describe Projects::Settings::CiCdController, feature_category: :continuous
             end
 
             it 'creates a pipeline', :sidekiq_inline do
-              project.repository.create_file(user, 'Gemfile', 'Gemfile contents',
-                                            message: 'Add Gemfile',
-                                            branch_name: 'master')
+              project.repository.create_file(user, 'Gemfile', 'Gemfile contents', message: 'Add Gemfile', branch_name: 'master')
 
               expect { subject }.to change { Ci::Pipeline.count }.by(1)
             end
diff --git a/spec/controllers/projects/settings/merge_requests_controller_spec.rb b/spec/controllers/projects/settings/merge_requests_controller_spec.rb
index 106ec62bea0..398fc97a00d 100644
--- a/spec/controllers/projects/settings/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/settings/merge_requests_controller_spec.rb
@@ -36,12 +36,11 @@ RSpec.describe Projects::Settings::MergeRequestsController do
         merge_method: :ff
       }
 
-      put :update,
-          params: {
-            namespace_id: project.namespace,
-            project_id: project.id,
-            project: params
-          }
+      put :update, params: {
+        namespace_id: project.namespace,
+        project_id: project.id,
+        project: params
+      }
 
       expect(response).to redirect_to project_settings_merge_requests_path(project)
       params.each do |param, value|
diff --git a/spec/controllers/projects/snippets/blobs_controller_spec.rb b/spec/controllers/projects/snippets/blobs_controller_spec.rb
index ca656705e07..4d12452e3d5 100644
--- a/spec/controllers/projects/snippets/blobs_controller_spec.rb
+++ b/spec/controllers/projects/snippets/blobs_controller_spec.rb
@@ -26,15 +26,14 @@ RSpec.describe Projects::Snippets::BlobsController do
     let(:inline) { nil }
 
     subject do
-      get(:raw,
-          params: {
-            namespace_id: project.namespace,
-            project_id: project,
-            snippet_id: snippet,
-            path: filepath,
-            ref: ref,
-            inline: inline
-          })
+      get :raw, params: {
+        namespace_id: project.namespace,
+        project_id: project,
+        snippet_id: snippet,
+        path: filepath,
+        ref: ref,
+        inline: inline
+      }
     end
 
     context 'with a snippet without a repository' do
diff --git a/spec/controllers/projects/snippets_controller_spec.rb b/spec/controllers/projects/snippets_controller_spec.rb
index a388fc4620f..119e52480db 100644
--- a/spec/controllers/projects/snippets_controller_spec.rb
+++ b/spec/controllers/projects/snippets_controller_spec.rb
@@ -102,12 +102,11 @@ RSpec.describe Projects::SnippetsController do
       project.add_maintainer(admin)
       sign_in(admin)
 
-      post :mark_as_spam,
-           params: {
-             namespace_id: project.namespace,
-             project_id: project,
-             id: snippet.id
-           }
+      post :mark_as_spam, params: {
+        namespace_id: project.namespace,
+        project_id: project,
+        id: snippet.id
+      }
     end
 
     it 'updates the snippet', :enable_admin_mode do
diff --git a/spec/controllers/projects/tree_controller_spec.rb b/spec/controllers/projects/tree_controller_spec.rb
index 9bc3065b6da..2b3adc719c1 100644
--- a/spec/controllers/projects/tree_controller_spec.rb
+++ b/spec/controllers/projects/tree_controller_spec.rb
@@ -21,12 +21,9 @@ RSpec.describe Projects::TreeController do
     before do
       expect(::Gitlab::GitalyClient).to receive(:allow_ref_name_caching).and_call_original
 
-      get(:show,
-          params: {
-            namespace_id: project.namespace.to_param,
-            project_id: project,
-            id: id
-          })
+      get :show, params: {
+        namespace_id: project.namespace.to_param, project_id: project, id: id
+      }
     end
 
     context "valid branch, no path" do
@@ -113,12 +110,9 @@ RSpec.describe Projects::TreeController do
       allow(::Gitlab::GitalyClient).to receive(:call).and_call_original
       expect(::Gitlab::GitalyClient).not_to receive(:call).with(anything, :commit_service, :find_commit, anything, anything)
 
-      get(:show,
-          params: {
-            namespace_id: project.namespace.to_param,
-            project_id: project,
-            id: id
-          })
+      get :show, params: {
+        namespace_id: project.namespace.to_param, project_id: project, id: id
+      }
 
       expect(response).to have_gitlab_http_status(:not_found)
     end
@@ -128,12 +122,9 @@ RSpec.describe Projects::TreeController do
     render_views
 
     before do
-      get(:show,
-          params: {
-            namespace_id: project.namespace.to_param,
-            project_id: project,
-            id: id
-          })
+      get :show, params: {
+        namespace_id: project.namespace.to_param, project_id: project, id: id
+      }
     end
 
     context 'redirect to blob' do
@@ -141,8 +132,7 @@ RSpec.describe Projects::TreeController do
 
       it 'redirects' do
         redirect_url = "/#{project.full_path}/-/blob/master/README.md"
-        expect(subject)
-          .to redirect_to(redirect_url)
+        expect(subject).to redirect_to(redirect_url)
       end
     end
   end
@@ -151,15 +141,14 @@ RSpec.describe Projects::TreeController do
     render_views
 
     before do
-      post(:create_dir,
-           params: {
-             namespace_id: project.namespace.to_param,
-             project_id: project,
-             id: 'master',
-             dir_name: path,
-             branch_name: branch_name,
-             commit_message: 'Test commit message'
-           })
+      post :create_dir, params: {
+        namespace_id: project.namespace.to_param,
+        project_id: project,
+        id: 'master',
+        dir_name: path,
+        branch_name: branch_name,
+        commit_message: 'Test commit message'
+      }
     end
 
     context 'successful creation' do