-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch 'configurable-attachment-size' into 'master'
Support configurable attachment size in Application Settings page ### What does this MR do? This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page. ### Are there points in the code the reviewer needs to double check? What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid. ### Why was this MR needed? We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? See Issue #1258 ### Screenshots Before:  After:  See merge request !407
Showing
- CHANGELOG 2 additions, 0 deletionsCHANGELOG
- app/assets/javascripts/dropzone_input.js.coffee 9 additions, 6 deletionsapp/assets/javascripts/dropzone_input.js.coffee
- app/controllers/admin/application_settings_controller.rb 1 addition, 0 deletionsapp/controllers/admin/application_settings_controller.rb
- app/controllers/application_controller.rb 1 addition, 0 deletionsapp/controllers/application_controller.rb
- app/models/application_setting.rb 3 additions, 1 deletionapp/models/application_setting.rb
- app/models/note.rb 8 additions, 2 deletionsapp/models/note.rb
- app/services/projects/upload_service.rb 7 additions, 1 deletionapp/services/projects/upload_service.rb
- app/views/admin/application_settings/_form.html.haml 5 additions, 0 deletionsapp/views/admin/application_settings/_form.html.haml
- app/views/projects/notes/_form.html.haml 1 addition, 1 deletionapp/views/projects/notes/_form.html.haml
- config/initializers/1_settings.rb 1 addition, 0 deletionsconfig/initializers/1_settings.rb
- db/migrate/20150328132231_add_max_attachment_size_to_application_settings.rb 5 additions, 0 deletions...132231_add_max_attachment_size_to_application_settings.rb
- db/schema.rb 2 additions, 1 deletiondb/schema.rb
- features/project/issues/issues.feature 1 addition, 0 deletionsfeatures/project/issues/issues.feature
- features/steps/project/issues/issues.rb 6 additions, 0 deletionsfeatures/steps/project/issues/issues.rb
- lib/file_size_validator.rb 10 additions, 2 deletionslib/file_size_validator.rb
- lib/gitlab/current_settings.rb 2 additions, 1 deletionlib/gitlab/current_settings.rb
- spec/lib/file_size_validator_spec.rb 43 additions, 0 deletionsspec/lib/file_size_validator_spec.rb
- spec/services/projects/upload_service_spec.rb 10 additions, 0 deletionsspec/services/projects/upload_service_spec.rb
Loading
Please register or sign in to comment