diff options
| author | themaze75 <maze@novisoft.com> | 2015-06-05 17:16:32 +0000 |
|---|---|---|
| committer | Eric Maziade <eric@maziade.com> | 2015-06-10 22:10:00 -0400 |
| commit | 1d080f57454fda46eb60700a8693cb968e6d557f (patch) | |
| tree | f94ed33eccf48632ee52f9095ff7745b56c47cb3 /app/models | |
| parent | 84a414fe534ebb60c8e7396c245486be521e2a11 (diff) | |
| download | gitlab-ce-1d080f57454fda46eb60700a8693cb968e6d557f.tar.gz | |
session_expire_seconds => session_expire_delay
delay is in seconds
more legible code in session_store
Added `GitLab restart required` help block to session_expire_delay
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/application_setting.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index ce06e022c3d..29f8fac470b 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -15,7 +15,7 @@ # twitter_sharing_enabled :boolean default(TRUE) # restricted_visibility_levels :text # max_attachment_size :integer default(10), not null -# session_expire_seconds :integer default(604800), not null +# session_expire_delay :integer default(10080), not null # default_project_visibility :integer # default_snippet_visibility :integer # restricted_signup_domains :text @@ -27,6 +27,10 @@ class ApplicationSetting < ActiveRecord::Base serialize :restricted_visibility_levels serialize :restricted_signup_domains, Array attr_accessor :restricted_signup_domains_raw + + validates :session_expire_delay, + presence: true, + numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :home_page_url, allow_blank: true, @@ -62,7 +66,7 @@ class ApplicationSetting < ActiveRecord::Base sign_in_text: Settings.extra['sign_in_text'], restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'], max_attachment_size: Settings.gitlab['max_attachment_size'], - session_expire_seconds: Settings.gitlab['session_expire_seconds'], + session_expire_delay: Settings.gitlab['session_expire_delay'], default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'], default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'], restricted_signup_domains: Settings.gitlab['restricted_signup_domains'] |