diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-08-22 14:18:09 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-08-23 10:45:20 +0200 |
| commit | dc7c6bede27abd4507072276ef23b40a74ee297a (patch) | |
| tree | 3337af56f28df2cbd0f33a369b0a42fa3cec2c95 /spec/services/merge_requests/merge_service_spec.rb | |
| parent | 65f83941c39c14c2af9da5064393545ea2f7b3e5 (diff) | |
| download | gitlab-ce-dc7c6bede27abd4507072276ef23b40a74ee297a.tar.gz | |
Move GitHooksService to Gitlab::Git
Diffstat (limited to 'spec/services/merge_requests/merge_service_spec.rb')
| -rw-r--r-- | spec/services/merge_requests/merge_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb index e593bfeeaf7..5cfdb5372f3 100644 --- a/spec/services/merge_requests/merge_service_spec.rb +++ b/spec/services/merge_requests/merge_service_spec.rb @@ -217,7 +217,7 @@ describe MergeRequests::MergeService do it 'logs and saves error if there is an PreReceiveError exception' do error_message = 'error message' - allow(service).to receive(:repository).and_raise(GitHooksService::PreReceiveError, error_message) + allow(service).to receive(:repository).and_raise(Gitlab::Git::HooksService::PreReceiveError, error_message) allow(service).to receive(:execute_hooks) service.execute(merge_request) |