summaryrefslogtreecommitdiff
path: root/app/models/application_setting.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-06-13 00:22:55 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-06-13 00:31:08 -0400
commit567a25b63032a82fd188177ea7a29a92ca2dc381 (patch)
tree3e4da482eda8279bd5154c37ee3ec04ac39afd5b /app/models/application_setting.rb
parent89b56c81d0592390678c846b3a3db1ba35d9f0d4 (diff)
downloadgitlab-ce-567a25b63032a82fd188177ea7a29a92ca2dc381.tar.gz
Ensure `session_expire_delay` field exists before accessing itrs-issue-1798
Closes #1798
Diffstat (limited to 'app/models/application_setting.rb')
-rw-r--r--app/models/application_setting.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 29f8fac470b..fee52694099 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -27,10 +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 :session_expire_delay,
+ presence: true,
+ numericality: { only_integer: true, greater_than_or_equal_to: 0 }
validates :home_page_url,
allow_blank: true,