diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-10-18 12:05:47 +0200 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-18 08:32:17 -0500 |
| commit | 72d84e48511fcf88b1d9efb622eb37cdff95aa1c (patch) | |
| tree | 482151e9cf693ba0f096091598cda7301ed3363a | |
| parent | ab8ef17fb2a2aa85a76d9106894280be9b910fda (diff) | |
| download | gitlab-ce-21444-pipeliens-new-mr.tar.gz | |
Improve code that creates a list of commits for MR21444-pipeliens-new-mr
| -rw-r--r-- | app/models/merge_request.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index ced0c13b837..fedc35102ef 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -797,9 +797,10 @@ class MergeRequest < ActiveRecord::Base def all_commits_sha if persisted? merge_request_diffs.flat_map(&:commits_sha).uniq + elsif compare_commits + compare_commits.to_a.reverse.map(&:id) else - cached_commits = compare_commits.to_a.reverse.map(&:id) - cached_commits.any? ? cached_commits : [diff_head_sha] + [diff_head_sha] end end |