diff options
| author | Jose Ivan Vargas Lopez <jvargas@gitlab.com> | 2017-06-07 23:31:06 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas Lopez <jvargas@gitlab.com> | 2017-06-07 23:31:06 +0000 |
| commit | fb80347dc00657ba36576f1f23bd42fdbcf9520a (patch) | |
| tree | 2642ac39cda31e29ea80defdc71e00c89ac8979e /app/models/blob_viewer/text.rb | |
| parent | 73924cc51495f5f497114ed9f9de02f8b9c4205b (diff) | |
| parent | 6eb96b2019d392d906a64108dbe83b3ce7cce758 (diff) | |
| download | gitlab-ce-additional-metrics-dashboard.tar.gz | |
Merge branch '28717-additional-metrics-review-branch' into 'additional-metrics-dashboard'additional-metrics-dashboard
# Conflicts:
# app/assets/stylesheets/pages/environments.scss
Diffstat (limited to 'app/models/blob_viewer/text.rb')
| -rw-r--r-- | app/models/blob_viewer/text.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/blob_viewer/text.rb b/app/models/blob_viewer/text.rb index eddca50b4d4..f68cbb7e212 100644 --- a/app/models/blob_viewer/text.rb +++ b/app/models/blob_viewer/text.rb @@ -5,7 +5,7 @@ module BlobViewer self.partial_name = 'text' self.binary = false - self.overridable_max_size = 1.megabyte - self.max_size = 10.megabytes + self.collapse_limit = 1.megabyte + self.size_limit = 10.megabytes end end |