diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-12-27 15:10:20 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-12-27 15:10:20 +0300 |
commit | 07f0486cf8d5952afb76d153888e600f1f26ad87 (patch) | |
tree | 373aaa0180a91a1ba26378726ca72fe6aa75bf14 /app/models | |
parent | 2a830f87cfae686aa88f995b179f155d1e3537b5 (diff) | |
parent | 1e5e56c698740e049a3fcf7b578ac006d5deef42 (diff) |
Merge branch '25931-gitlab-merge-request-view-crash-when-commiting-a-js-sourcemap-file' into 'master'
Resolve "Gitlab merge request view crash when commiting a js sourcemap file"
Closes #25931
See merge request !8310
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 5ce20cc43d6..22490d121c7 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -198,7 +198,9 @@ class MergeRequest < ActiveRecord::Base end def diff_size - diffs(diff_options).size + opts = diff_options || {} + + raw_diffs(opts).size end def diff_base_commit |