diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-31 14:18:10 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-31 14:18:10 +0300 |
| commit | 223f1f3d2dd95d6b87a485ce0df6f4fef77eb522 (patch) | |
| tree | 76ad8d115215947d73b9d0d0fccae4fb907591ea /spec | |
| parent | 4427a2634dfbb7f97b038c5c93129a2c5937eb3f (diff) | |
| parent | 14326c88f7710bd0ffc7b148a87c6dc2188e2683 (diff) | |
Merge branch '24795_refactor_merge_request_build_service' into 'master'
Refactor MergeRequest::BuildService
Closes #24795
See merge request !8462
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/merge_requests/user_uses_slash_commands_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/user_uses_slash_commands_spec.rb b/spec/features/merge_requests/user_uses_slash_commands_spec.rb index b13674b4db9..2582a540240 100644 --- a/spec/features/merge_requests/user_uses_slash_commands_spec.rb +++ b/spec/features/merge_requests/user_uses_slash_commands_spec.rb @@ -11,7 +11,7 @@ feature 'Merge Requests > User uses slash commands', feature: true, js: true do it_behaves_like 'issuable record that supports slash commands in its description and notes', :merge_request do let(:issuable) { create(:merge_request, source_project: project) } - let(:new_url_opts) { { merge_request: { source_branch: 'feature' } } } + let(:new_url_opts) { { merge_request: { source_branch: 'feature', target_branch: 'master' } } } end describe 'merge-request-only commands' do |