diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 21:08:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 21:08:34 +0300 |
| commit | 571d993b49313dd806bd3f6af16d36c26d9d28ca (patch) | |
| tree | 06bd12c4b56b97881aef8a00d4d46698de1eb63f /app/models/diff_viewer | |
| parent | 9044365a91112d426fbbfba07eca595652bbe2df (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/diff_viewer')
| -rw-r--r-- | app/models/diff_viewer/base.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/diff_viewer/base.rb b/app/models/diff_viewer/base.rb index 37831683555..75aa51348c8 100644 --- a/app/models/diff_viewer/base.rb +++ b/app/models/diff_viewer/base.rb @@ -4,7 +4,7 @@ module DiffViewer class Base PARTIAL_PATH_PREFIX = 'projects/diffs/viewers' - class_attribute :partial_name, :type, :extensions, :file_types, :binary, :switcher_icon, :switcher_title + class_attribute :partial_name, :type, :extensions, :binary, :switcher_icon, :switcher_title # These limits relate to the sum of the old and new blob sizes. # Limits related to the actual size of the diff are enforced in Gitlab::Diff::File. @@ -50,7 +50,6 @@ module DiffViewer return true if blob.nil? return false if verify_binary && binary? != blob.binary_in_repo? return true if extensions&.include?(blob.extension) - return true if file_types&.include?(blob.file_type) false end |