diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-01 09:10:53 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-01 09:10:53 +0000 |
commit | 04251829ba135a8bab845e9e49d8475eb0211e86 (patch) | |
tree | cc39e928a905204eaa4032299a51009f94a000b5 /lib/api/entities.rb | |
parent | dd7449b92454dd614b5a60efd5fe44561174d2fa (diff) | |
parent | 04cf618b6ff943527938f64a451a420b494b5a76 (diff) | |
download | gitlab-ce-04251829ba135a8bab845e9e49d8475eb0211e86.tar.gz |
Merge branch 'dm-collapsed-blob' into 'master'
Consistent diff and blob size limit names
See merge request !11776
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r-- | lib/api/entities.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index fc8183a62c1..e3258fdcffe 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -331,7 +331,7 @@ module API class MergeRequestChanges < MergeRequest expose :diffs, as: :changes, using: Entities::RepoDiff do |compare, _| - compare.raw_diffs(all_diffs: true).to_a + compare.raw_diffs(limits: false).to_a end end @@ -344,7 +344,7 @@ module API expose :commits, using: Entities::RepoCommit expose :diffs, using: Entities::RepoDiff do |compare, _| - compare.raw_diffs(all_diffs: true).to_a + compare.raw_diffs(limits: false).to_a end end @@ -548,7 +548,7 @@ module API end expose :diffs, using: Entities::RepoDiff do |compare, options| - compare.diffs(all_diffs: true).to_a + compare.diffs(limits: false).to_a end expose :compare_timeout do |compare, options| |