diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-02 23:26:35 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-02 23:26:35 +0000 |
| commit | e7d530a624fbb8854047c3983eaa0972a19f36c8 (patch) | |
| tree | 92f77913a359ccf4078cf010add02d8b8f765490 /spec/services/merge_requests | |
| parent | dce77b1d6d5e2b82441a685d385ee809c6b35b76 (diff) | |
| parent | 54fca95160389fe7993df5d82635b83804833fee (diff) | |
| download | gitlab-ce-e7d530a624fbb8854047c3983eaa0972a19f36c8.tar.gz | |
Merge branch 'fix-git-hooks-when-creating-file' into 'master'
Don't execute git hooks if you create branch as part of other change
Closes #23439
See merge request !7237
Diffstat (limited to 'spec/services/merge_requests')
| -rw-r--r-- | spec/services/merge_requests/resolve_service_spec.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/spec/services/merge_requests/resolve_service_spec.rb b/spec/services/merge_requests/resolve_service_spec.rb index 388abb6a0df..a0e51681725 100644 --- a/spec/services/merge_requests/resolve_service_spec.rb +++ b/spec/services/merge_requests/resolve_service_spec.rb @@ -66,7 +66,13 @@ describe MergeRequests::ResolveService do context 'when the source project is a fork and does not contain the HEAD of the target branch' do let!(:target_head) do - project.repository.commit_file(user, 'new-file-in-target', '', 'Add new file in target', 'conflict-start', false) + project.repository.commit_file( + user, + 'new-file-in-target', + '', + message: 'Add new file in target', + branch_name: 'conflict-start', + update: false) end before do |