diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-26 18:27:30 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-29 17:02:02 -0500 |
| commit | aed0387f97ec62b184da90bdca0ce40f9dc58b45 (patch) | |
| tree | 54223237527ddbcaa93bfea552f2fda2b6c1c61f /app/models/merge_request.rb | |
| parent | 1ac12698c613774bdace72475573916c142a07e4 (diff) | |
| download | gitlab-ce-aed0387f97ec62b184da90bdca0ce40f9dc58b45.tar.gz | |
Consistent diff and blob size limit names
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 356af776b8d..56fec3ca39c 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -220,10 +220,10 @@ class MergeRequest < ActiveRecord::Base def diffs(diff_options = {}) if compare - # When saving MR diffs, `no_collapse` is implicitly added (because we need + # When saving MR diffs, `expanded` is implicitly added (because we need # to save the entire contents to the DB), so add that here for # consistency. - compare.diffs(diff_options.merge(no_collapse: true)) + compare.diffs(diff_options.merge(expanded: true)) else merge_request_diff.diffs(diff_options) end |