summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorEric Maziade <eric.maziade@novisoft.com>2015-06-05 11:50:37 -0400
committerEric Maziade <eric.maziade@novisoft.com>2015-06-05 11:50:37 -0400
commit84a414fe534ebb60c8e7396c245486be521e2a11 (patch)
tree35880b0bf1bdd1ba5818bbea464e86c7391f2407 /app/controllers/admin
parent971e57cffa6a89ebcd4da83efc4967f834f8f58b (diff)
downloadgitlab-ce-84a414fe534ebb60c8e7396c245486be521e2a11.tar.gz
Add session expiration delay configuration through UI application
settings
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/application_settings_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index a01e2a907d7..2601867cf03 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -40,6 +40,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:home_page_url,
:after_sign_out_path,
:max_attachment_size,
+ :session_expire_seconds,
:default_project_visibility,
:default_snippet_visibility,
:restricted_signup_domains_raw,