diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-02-23 17:19:28 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-02-23 17:19:28 +0000 |
| commit | 170fef0bd34a853bc2499cc7335705f73bc98edb (patch) | |
| tree | f7af5116b41b7d697f9ac783bc647aba0d2902ab /app/models/merge_request.rb | |
| parent | 6a39888344a2478db022fdf8b5e41fd7625d83ab (diff) | |
| parent | ade5e0b1ba04047c72cb0aff3d635a2cdaaab43c (diff) | |
| download | gitlab-ce-170fef0bd34a853bc2499cc7335705f73bc98edb.tar.gz | |
Merge branch 'dm-meer-blauw-op-straat' into 'master'
Enable (and disable) more RuboCops
See merge request !9432
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 9076179b0b3..7eb875f1ef5 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -531,7 +531,7 @@ class MergeRequest < ActiveRecord::Base } if diff_head_commit - attrs.merge!(last_commit: diff_head_commit.hook_attrs) + attrs[:last_commit] = diff_head_commit.hook_attrs end attributes.merge!(attrs) |