diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-03 13:03:57 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-03 13:03:57 +0100 |
| commit | 7788118c3d059ef93bcc49c1b6b6ec7d72faf8b5 (patch) | |
| tree | 6642a358083285d90234f8d4ba27d61bfd9448bd /app/controllers/projects/blob_controller.rb | |
| parent | 637ed8a21e9f9457d1b194f9c591a0813c20cc3e (diff) | |
| parent | cac04fbd777ff992bbd92e9ae3cded01d45b07d0 (diff) | |
| download | gitlab-ce-7788118c3d059ef93bcc49c1b6b6ec7d72faf8b5.tar.gz | |
Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue
Diffstat (limited to 'app/controllers/projects/blob_controller.rb')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index be5822b2cd4..9489bbddfc4 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -35,7 +35,7 @@ class Projects::BlobController < Projects::ApplicationController end def show - @blob.override_max_size! if params[:override_max_size] == 'true' + override_max_blob_size(@blob) respond_to do |format| format.html do |