Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 12 deletions

diff --git a/spec/workers/update_merge_requests_worker_spec.rb b/spec/workers/update_merge_requests_worker_spec.rb
index 486dade454a..14a363f9d59 100644
--- a/spec/workers/update_merge_requests_worker_spec.rb
+++ b/spec/workers/update_merge_requests_worker_spec.rb
@@ -26,17 +26,5 @@ describe UpdateMergeRequestsWorker do
 
       perform
     end
-
-    context 'when slow' do
-      before do
-        stub_const("UpdateMergeRequestsWorker::LOG_TIME_THRESHOLD", -1)
-      end
-
-      it 'logs debug info' do
-        expect(Rails.logger).to receive(:info).with(a_string_matching(/\AUpdateMergeRequestsWorker#perform.*project_id=#{project.id},user_id=#{user.id},oldrev=#{oldrev},newrev=#{newrev},ref=#{ref}/))
-
-        perform
-      end
-    end
   end
 end