diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-08-11 13:35:35 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-08-11 13:35:35 +0800 |
| commit | 0b52517049fc8ac01407018c8a6225d7788861a3 (patch) | |
| tree | 3c8c0cb1bdda06daa685c5f945ea99dd0c91dfc5 /lib/api/entities.rb | |
| parent | 5607fdf9fe51da75099effbaf8277c98290d6d96 (diff) | |
| parent | 87b07f6a65a35a53bb1afed9d2a7da00caa8d59f (diff) | |
| download | gitlab-ce-0b52517049fc8ac01407018c8a6225d7788861a3.tar.gz | |
Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slack
* upstream/master: (233 commits)
Fix awardable button mutuality loading spinners
Update CHANGELOG for 8.10.5
Clean up project destruction
Small refactor of doc/development/README.md
Avoid commit lookup on diff_helper
Removed extra newline from redis_spec.rb
Used cached value of project count to reduce DB load
Remove duplicate link_to statements
Mention add_column_with_default in downtime guide
Add missing space to generic badge template
Rename `run` task helper method to prevent conflict with StateMachine
Add a method in Project to return a cached value of total count of projects
spellcheck
Add svg guidelines to ui guide
Add Changelog entry for Grape upgrade [ci skip]
Fix Grape tests.
Retain old behavior
Update Grape from 0.13.0 to 0.15.0.
adds second batch of tests changed to active tense
fixes part1 of files to start using active tense
...
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index b6f6b11d97b..0178bbe7d1d 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -225,7 +225,7 @@ module API class MergeRequestChanges < MergeRequest expose :diffs, as: :changes, using: Entities::RepoDiff do |compare, _| - compare.diffs(all_diffs: true).to_a + compare.raw_diffs(all_diffs: true).to_a end end |