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 /config | |
| 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 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 15c1ae9466f..4c37fbf7cab 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -119,6 +119,7 @@ Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username Settings.gitlab['issue_closing_pattern'] = '((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)) +(?:(?:issues? +)?#\d+(?:(?:, *| +and +)?))+)' if Settings.gitlab['issue_closing_pattern'].nil? Settings.gitlab['default_projects_features'] ||= {} Settings.gitlab['webhook_timeout'] ||= 10 +Settings.gitlab['max_attachment_size'] ||= 10 Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil? Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil? Settings.gitlab.default_projects_features['wiki'] = true if Settings.gitlab.default_projects_features['wiki'].nil? |