diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 13:43:45 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 13:43:45 +0100 |
| commit | 75486f09c4b8f2df17e2c16bf4d97fceb34dc9ad (patch) | |
| tree | 9c44f07bf4991a208b969b8bddf0b04e1edb02be /app/models/merge_request.rb | |
| parent | e7969d6f6c743ead94b3b430b9184ad21f647337 (diff) | |
| parent | f5430e48b42227f1c1874ca27c6907f0f704be28 (diff) | |
| download | gitlab-ce-75486f09c4b8f2df17e2c16bf4d97fceb34dc9ad.tar.gz | |
Merge branch 'master' into zj/gitlab-ce-merge-if-green
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 4bcbd86a543..60fd2b9a757 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -312,7 +312,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 |