diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-16 14:21:44 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-16 14:21:44 +0100 |
| commit | 4657c28777dfc2729261f895f8e36cbef51395bc (patch) | |
| tree | 86c2483e843be06ad10c0f0b43f6a20da3a5a6b8 /app/models/application_setting.rb | |
| parent | 5456859b5b28baca95ced74179a349563498a5f0 (diff) | |
| parent | daaaf5ef9f182761ac07d76d24d971765134c7e1 (diff) | |
| download | gitlab-ce-fix/keep-artifacts-button-visibility.tar.gz | |
Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibility
* master: (579 commits)
Conflicts:
spec/models/build_spec.rb
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index bf463a3b6bb..8fab77cda0a 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -68,6 +68,10 @@ class ApplicationSetting < ActiveRecord::Base presence: true, if: :koding_enabled + validates :plantuml_url, + presence: true, + if: :plantuml_enabled + validates :max_attachment_size, presence: true, numericality: { only_integer: true, greater_than: 0 } @@ -184,6 +188,8 @@ class ApplicationSetting < ActiveRecord::Base akismet_enabled: false, koding_enabled: false, koding_url: nil, + plantuml_enabled: false, + plantuml_url: nil, repository_checks_enabled: true, disabled_oauth_sign_in_sources: [], send_user_confirmation_email: false, |