diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request_diff.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index 7362886e9f5..afa3611d044 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -120,8 +120,10 @@ class MergeRequestDiff < ActiveRecord::Base def commits_sha if @commits commits.map(&:sha) - else + elsif st_commits st_commits.map { |commit| commit[:id] } + else + [] end end |