diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 15:07:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 15:07:33 +0300 |
| commit | 784fae4b9d7e92350075df2a43d06893080ed1e6 (patch) | |
| tree | c7a6fd444acd6897622b233b250a34fd176f01da /spec/services/merge_requests/refresh_service_spec.rb | |
| parent | fc53ce8e6ca67bf217470179a1ea6cf139bcffad (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/merge_requests/refresh_service_spec.rb')
| -rw-r--r-- | spec/services/merge_requests/refresh_service_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb index 9e69f179da9..1ba216e8ff1 100644 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ b/spec/services/merge_requests/refresh_service_spec.rb @@ -608,6 +608,7 @@ describe MergeRequests::RefreshService do context 'marking the merge request as work in progress' do let(:refresh_service) { service.new(@project, @user) } + before do allow(refresh_service).to receive(:execute_hooks) end |