diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-12-07 14:11:15 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-12-07 14:14:35 +0200 |
| commit | 5df2c4419c5019b5003ddfa6adb59c84c3d9910c (patch) | |
| tree | 12cdcec680fb9d97431ca14d9edd138aa7627f03 /app/models/merge_request.rb | |
| parent | 5c1b49f494f07bf37ba3c60f3b9f70d1842d8b60 (diff) | |
| download | gitlab-ce-5df2c4419c5019b5003ddfa6adb59c84c3d9910c.tar.gz | |
fox specs
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 1b3d6079d2c..92a82d44c76 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -291,7 +291,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 |