diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-12 11:18:42 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-12 11:18:42 +0000 |
| commit | 50fff719fc148ac9f6f6a309770c6136a3aeb31b (patch) | |
| tree | 41b5b02207d66ef079b7b242b046822211c990d9 /app/models | |
| parent | e798ee718312dbe7445ec9cf2e75045e8b2b3117 (diff) | |
| parent | f986b4c4e529f4c2518f0ce37dc9dfcaa2f073a0 (diff) | |
| download | gitlab-ce-20450-retry-build-button.tar.gz | |
Merge branch 'Sanson/gitlab-ce-asciidoctor-plantuml' into 'master'
20450-retry-build-button
Add support for PlantUML diagrams in Asciidoc.
Closes #17603
See merge request !8537
Diffstat (limited to 'app/models')
| -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, |