summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorthemaze75 <maze@novisoft.com>2015-06-05 17:16:32 +0000
committerEric Maziade <eric@maziade.com>2015-06-10 22:10:00 -0400
commit1d080f57454fda46eb60700a8693cb968e6d557f (patch)
treef94ed33eccf48632ee52f9095ff7745b56c47cb3 /app/controllers/admin
parent84a414fe534ebb60c8e7396c245486be521e2a11 (diff)
downloadgitlab-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/controllers/admin')
-rw-r--r--app/controllers/admin/application_settings_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 2601867cf03..c7c643db401 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -40,7 +40,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:home_page_url,
:after_sign_out_path,
:max_attachment_size,
- :session_expire_seconds,
+ :session_expire_delay,
:default_project_visibility,
:default_snippet_visibility,
:restricted_signup_domains_raw,