diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-06-21 17:54:41 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-06-21 17:59:20 +0100 |
| commit | b2f60bb9a118c366ad462241bd4842c52d872d5f (patch) | |
| tree | c35dd2323dbd6af967dbcb7ba261c6e3debca458 | |
| parent | 707e8d434da9dd8ee07ac2cb8b9556c132aa52ca (diff) | |
| download | gitlab-ce-fix-auto-mr-close.tar.gz | |
Fix auto-MR-close text from branch namefix-auto-mr-close
Rails's form helpers use the `$attr_before_type_cast` method where
available, and this value only appears to be updated on assignment, not
when the object is mutated in some other way:
[1] pry(main)> mr = MergeRequest.new
=> #<MergeRequest:0x007fcf28395d88 ...>
[2] pry(main)> mr.description = 'foo'
=> "foo"
[3] pry(main)> mr.description << ' bar'
=> "foo bar"
[4] pry(main)> mr.description
=> "foo bar"
[5] pry(main)> mr.description_before_type_cast
=> "foo"
[6] pry(main)> mr.description += ' bar'
=> "foo bar bar"
[7] pry(main)> mr.description_before_type_cast
=> "foo bar bar"
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/services/merge_requests/build_service.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 0c3aadc29d1..374cc971ef3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,6 +13,7 @@ v 8.9.0 (unreleased) - Fix endless redirections when accessing user OAuth applications when they are disabled - Allow enabling wiki page events from Webhook management UI - Bump rouge to 1.11.0 + - Fix MR-auto-close text added to description - Fix issue with arrow keys not working in search autocomplete dropdown - Fix an issue where note polling stopped working if a window was in the background during a refresh. diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index 1b48899bb0a..7fe57747265 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -83,7 +83,7 @@ module MergeRequests closes_issue = "Closes ##{iid}" if merge_request.description.present? - merge_request.description << closes_issue.prepend("\n") + merge_request.description += closes_issue.prepend("\n") else merge_request.description = closes_issue end |