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/models | |
| 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/models')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 1c72513520d..2d10c6ef1da 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -604,7 +604,7 @@ describe MergeRequest do request = build_stubbed(:merge_request) expect(request.merge_commit_message) - .to match("See merge request #{request.to_reference}") + .to match("See merge request #{request.to_reference(full: true)}") end it 'excludes multiple linebreak runs when description is blank' do |