home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-session_expire_delay' into 'master'

Browse Source 
read session_expire_delay from database if table & column exists;

Previous code only ends up using the default value for session_expire_delay, not the value stored in the database, making the session always 1 week.

See merge request !1217
This commit is contained in:
Stan Hu
2015-08-28 07:55:51 +00:00
parent 53698401fb 23aee0ca8a
commit a429eb4d45
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gitlab/current_settings.rb
+1 -1
View File
@@ -4,7 +4,7 @@ module Gitlab
key = :current_application_settings
RequestStore.store[key] ||= begin
if ActiveRecord::Base.connected? && ActiveRecord::Base.connection.table_exists?('application_settings')
if ActiveRecord::Base.connection.active? && ActiveRecord::Base.connection.table_exists?('application_settings')
ApplicationSetting.current || ApplicationSetting.create_from_defaults
else
fake_application_settings