diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-24 09:09:45 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-24 09:09:45 +0000 |
| commit | 7ab4efa8f8c1c1c0b80684d13bfbb777485f1199 (patch) | |
| tree | 893684bad690399bdd9dc2f08305488488669d17 /spec/features/merge_requests | |
| parent | 87119f78cfcf51d8748115e5921aa78b3295f7f1 (diff) | |
| parent | f5046e5258c9e53b11816490fbdca4134dd5ad0c (diff) | |
| download | gitlab-ce-7ab4efa8f8c1c1c0b80684d13bfbb777485f1199.tar.gz | |
Merge branch '36262_merge_request_reference_in_merge_commit_global' into 'master'
fix Merge request reference in merge commit is not global
Closes #36262
See merge request !13518
Diffstat (limited to 'spec/features/merge_requests')
| -rw-r--r-- | spec/features/merge_requests/merge_commit_message_toggle_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_requests/merge_commit_message_toggle_spec.rb b/spec/features/merge_requests/merge_commit_message_toggle_spec.rb index 429bc277d73..08a3bb84aac 100644 --- a/spec/features/merge_requests/merge_commit_message_toggle_spec.rb +++ b/spec/features/merge_requests/merge_commit_message_toggle_spec.rb @@ -19,7 +19,7 @@ feature 'Clicking toggle commit message link', js: true do "Merge branch 'feature' into 'master'", merge_request.title, "Closes #{issue_1.to_reference} and #{issue_2.to_reference}", - "See merge request #{merge_request.to_reference}" + "See merge request #{merge_request.to_reference(full: true)}" ].join("\n\n") end let(:message_with_description) do @@ -27,7 +27,7 @@ feature 'Clicking toggle commit message link', js: true do "Merge branch 'feature' into 'master'", merge_request.title, merge_request.description, - "See merge request #{merge_request.to_reference}" + "See merge request #{merge_request.to_reference(full: true)}" ].join("\n\n") end |