diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 18:10:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 18:10:28 +0300 |
commit | 63324f9cfd863cda2f717835efc933cdd5ade792 (patch) | |
tree | 65717323c2d3f1f35ebff2441823f16aa9e27eb0 /spec/services/auto_merge_service_spec.rb | |
parent | 4944e9e5a9a3f57998c5033b10cdfa2975b71227 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/auto_merge_service_spec.rb')
-rw-r--r-- | spec/services/auto_merge_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/auto_merge_service_spec.rb b/spec/services/auto_merge_service_spec.rb index eab95973e1b..3f7a26aa00e 100644 --- a/spec/services/auto_merge_service_spec.rb +++ b/spec/services/auto_merge_service_spec.rb @@ -148,7 +148,7 @@ RSpec.describe AutoMergeService do end describe '#update' do - subject { service.update(merge_request) } + subject { service.update(merge_request) } # rubocop:disable Rails/SaveBang context 'when auto merge is enabled' do let(:merge_request) { create(:merge_request, :merge_when_pipeline_succeeds) } |