diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-03-20 05:11:12 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-04-02 00:04:08 -0700 |
| commit | dfd256f29ee817b5ffc563bb554a02d26ae44502 (patch) | |
| tree | c28e943c541df30a2a0ab03905bf5d7bbe61b3ba /app/controllers/application_controller.rb | |
| parent | 16a6ea2d1769f68157976b83bf6da468dd38853d (diff) | |
| download | gitlab-ce-dfd256f29ee817b5ffc563bb554a02d26ae44502.tar.gz | |
Support configurable attachment size via Application Settings
Fix bug where error messages from Dropzone would not be displayed on the issues page
Closes #1258
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2809f90c0d5..80e983b5314 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -203,6 +203,7 @@ class ApplicationController < ActionController::Base gon.api_version = API::API.version gon.relative_url_root = Gitlab.config.gitlab.relative_url_root gon.default_avatar_url = URI::join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s + gon.max_file_size = current_application_settings.max_attachment_size; if current_user gon.current_user_id = current_user.id |