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/concerns | |
| 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/concerns')
| -rw-r--r-- | app/controllers/concerns/renders_blob.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/renders_blob.rb b/app/controllers/concerns/renders_blob.rb index 1d37e4cb3bd..54dcd7c61ce 100644 --- a/app/controllers/concerns/renders_blob.rb +++ b/app/controllers/concerns/renders_blob.rb @@ -18,7 +18,7 @@ module RendersBlob } end - def override_max_blob_size(blob) - blob.override_max_size! if params[:override_max_size] == 'true' + def conditionally_expand_blob(blob) + blob.expand! if params[:expanded] == 'true' end end |