summaryrefslogtreecommitdiff
path: root/app/models/application_setting.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-30 17:12:50 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-05-31 13:23:13 +0200
commit846d111f1d07e62e295ea778b85ada9088be2f31 (patch)
tree283a58e566cdaa42d003875713940daaaa2635ec /app/models/application_setting.rb
parentba81c91255aac2d724ceb94e3eb91f912227e2eb (diff)
downloadgitlab-ce-846d111f1d07e62e295ea778b85ada9088be2f31.tar.gz
Add Application Setting to configure Container Registry token expire delay (default 5min)
Diffstat (limited to 'app/models/application_setting.rb')
-rw-r--r--app/models/application_setting.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 9a14954b4a7..fc48307b75d 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -51,6 +51,10 @@ class ApplicationSetting < ActiveRecord::Base
presence: true,
numericality: { only_integer: true, greater_than: 0 }
+ validates :container_registry_token_expire_delay,
+ presence: true,
+ numericality: { only_integer: true, greater_than: 0 }
+
validates_each :restricted_visibility_levels do |record, attr, value|
unless value.nil?
value.each do |level|
@@ -121,7 +125,8 @@ class ApplicationSetting < ActiveRecord::Base
akismet_enabled: false,
repository_checks_enabled: true,
disabled_oauth_sign_in_sources: [],
- send_user_confirmation_email: false
+ send_user_confirmation_email: false,
+ container_registry_token_expire_delay: 5,
)
end