diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 12:50:25 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 12:50:25 +0100 |
| commit | 3c80a543153f8f686ec99d2d04b181b2d2c8a665 (patch) | |
| tree | 679ca3921b00bd9e0904b4ad1be4e01d0a753ee9 /app/models/merge_request.rb | |
| parent | 1a942111653e9376d6275c5bd31f23cb27f58ab5 (diff) | |
| parent | f5430e48b42227f1c1874ca27c6907f0f704be28 (diff) | |
| download | gitlab-ce-ui/misc.tar.gz | |
Merge branch 'master' into ui/miscui/misc
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 2a4aee7e5d9..080b7f7fb88 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -295,7 +295,7 @@ class MergeRequest < ActiveRecord::Base work_in_progress: work_in_progress? } - unless last_commit.nil? + if last_commit attrs.merge!(last_commit: last_commit.hook_attrs) end |