diff options
| author | Akos Gyimesi <akos@gyim.hu> | 2018-01-18 02:12:08 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-12-06 20:20:08 +0300 |
| commit | 4a31c6778decb3ea251b0943f1c8ebda0ad98800 (patch) | |
| tree | 1eeca043a758c92bde542025db556d5d1b130e46 /spec/controllers | |
| parent | 5fd5dad492a2918c10633996bb29d656a4e9137a (diff) | |
Link to conflicting MR in reopening error message
Also, the error message became shorter.
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 9e8ec99e314..f64bda7154b 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -298,7 +298,7 @@ describe Projects::MergeRequestsController do update_merge_request(state_event: 'reopen') - expect(controller).to set_flash[:alert].to(/another open Merge Request already exists for this source branch/) + expect(controller).to set_flash[:alert].to(/Another open Merge Request already exists for this source branch/) expect(merge_request.reload).to be_closed end end |