Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 29 deletions

diff --git a/spec/services/git/process_ref_changes_service_spec.rb b/spec/services/git/process_ref_changes_service_spec.rb
index 35ddf95b5f6..fc5e379f51d 100644
--- a/spec/services/git/process_ref_changes_service_spec.rb
+++ b/spec/services/git/process_ref_changes_service_spec.rb
@@ -55,36 +55,14 @@ describe Git::ProcessRefChangesService do
         stub_application_setting(push_event_hooks_limit: push_event_hooks_limit)
       end
 
-      context 'git_push_execute_all_project_hooks is disabled' do
-        before do
-          stub_feature_flags(git_push_execute_all_project_hooks: false)
-        end
-
-        it "calls #{push_service_class} with execute_project_hooks set to false" do
-          expect(push_service_class)
-            .to receive(:new)
-            .with(project, project.owner, hash_including(execute_project_hooks: false))
-            .exactly(changes.count).times
-            .and_return(service)
-
-          subject.execute
-        end
-      end
-
-      context 'git_push_execute_all_project_hooks is enabled' do
-        before do
-          stub_feature_flags(git_push_execute_all_project_hooks: true)
-        end
-
-        it "calls #{push_service_class} with execute_project_hooks set to true" do
-          expect(push_service_class)
-            .to receive(:new)
-            .with(project, project.owner, hash_including(execute_project_hooks: true))
-            .exactly(changes.count).times
-            .and_return(service)
+      it "calls #{push_service_class} with execute_project_hooks set to false" do
+        expect(push_service_class)
+          .to receive(:new)
+          .with(project, project.owner, hash_including(execute_project_hooks: false))
+          .exactly(changes.count).times
+          .and_return(service)
 
-          subject.execute
-        end
+        subject.execute
       end
     end