diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-20 12:56:20 +0300 |
|---|---|---|
| committer | Jose Vargas <jvargas@gitlab.com> | 2018-08-20 18:17:54 +0300 |
| commit | 236541bdd992f176cb3bb4565bc878d70ef90309 (patch) | |
| tree | 9b0b03b59afe5badd6ac2f683744bc3c38636634 /lib | |
| parent | e13427d150d182814bb93d2e305aaf18f7d984ff (diff) | |
Merge branch '49907-commits-and-merge-requests-does-not-list-all-files-when-one-file-exceeds-size-limits' into 'master'
Resolve "Commits and Merge Requests does not list all files when one file exceeds size limits"
Closes #49907
See merge request gitlab-org/gitlab-ce!21125
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/diff.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client/diff.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/git/diff.rb b/lib/gitlab/git/diff.rb index b58296375ef..61ce10ca131 100644 --- a/lib/gitlab/git/diff.rb +++ b/lib/gitlab/git/diff.rb @@ -226,6 +226,7 @@ module Gitlab @new_file = diff.from_id == BLANK_SHA @renamed_file = diff.from_path != diff.to_path @deleted_file = diff.to_id == BLANK_SHA + @too_large = diff.too_large if diff.respond_to?(:too_large) collapse! if diff.respond_to?(:collapsed) && diff.collapsed end diff --git a/lib/gitlab/gitaly_client/diff.rb b/lib/gitlab/gitaly_client/diff.rb index d98a0ce988f..af9d674535b 100644 --- a/lib/gitlab/gitaly_client/diff.rb +++ b/lib/gitlab/gitaly_client/diff.rb @@ -1,7 +1,7 @@ module Gitlab module GitalyClient class Diff - ATTRS = %i(from_path to_path old_mode new_mode from_id to_id patch overflow_marker collapsed).freeze + ATTRS = %i(from_path to_path old_mode new_mode from_id to_id patch overflow_marker collapsed too_large).freeze include AttributesBag end |