Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 22 deletions

diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index ca0c4b29ebe..d603cbb16aa 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -796,10 +796,6 @@ RSpec.describe MergeRequests::RefreshService do
     subject { service.execute(oldrev, newrev, 'refs/heads/merge-commit-analyze-before') }
 
     context 'feature enabled' do
-      before do
-        stub_feature_flags(branch_push_merge_commit_analyze: true)
-      end
-
       it "updates merge requests' merge_commits" do
         expect(Gitlab::BranchPushMergeCommitAnalyzer).to receive(:new).and_wrap_original do |original_method, commits|
           expect(commits.map(&:id)).to eq(%w{646ece5cfed840eca0a4feb21bcd6a81bb19bda3 29284d9bcc350bcae005872d0be6edd016e2efb5 5f82584f0a907f3b30cfce5bb8df371454a90051 8a994512e8c8f0dfcf22bb16df6e876be7a61036 689600b91aabec706e657e38ea706ece1ee8268f db46a1c5a5e474aa169b6cdb7a522d891bc4c5f9})
@@ -816,24 +812,6 @@ RSpec.describe MergeRequests::RefreshService do
         expect(merge_request_side_branch.merge_commit.id).to eq('29284d9bcc350bcae005872d0be6edd016e2efb5')
       end
     end
-
-    context 'when feature is disabled' do
-      before do
-        stub_feature_flags(branch_push_merge_commit_analyze: false)
-      end
-
-      it "does not trigger analysis" do
-        expect(Gitlab::BranchPushMergeCommitAnalyzer).not_to receive(:new)
-
-        subject
-
-        merge_request.reload
-        merge_request_side_branch.reload
-
-        expect(merge_request.merge_commit).to eq(nil)
-        expect(merge_request_side_branch.merge_commit).to eq(nil)
-      end
-    end
   end
 
   describe '#abort_ff_merge_requests_with_when_pipeline_succeeds' do