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 /app/controllers/projects/artifacts_controller.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 'app/controllers/projects/artifacts_controller.rb')
| -rw-r--r-- | app/controllers/projects/artifacts_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb index b46a33604ff..ea036b1f705 100644 --- a/app/controllers/projects/artifacts_controller.rb +++ b/app/controllers/projects/artifacts_controller.rb @@ -27,7 +27,7 @@ class Projects::ArtifactsController < Projects::ApplicationController def file blob = @entry.blob - override_max_blob_size(blob) + conditionally_expand_blob(blob) respond_to do |format| format.html do |