summaryrefslogtreecommitdiff
path: root/db
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 /db
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 'db')
-rw-r--r--db/migrate/20150604202921_add_session_expire_seconds_for_application_settings.rb5
-rw-r--r--db/migrate/20150609141121_add_session_expire_delay_for_application_settings.rb5
-rw-r--r--db/schema.rb2
3 files changed, 6 insertions, 6 deletions
diff --git a/db/migrate/20150604202921_add_session_expire_seconds_for_application_settings.rb b/db/migrate/20150604202921_add_session_expire_seconds_for_application_settings.rb
deleted file mode 100644
index 8096efc6865..00000000000
--- a/db/migrate/20150604202921_add_session_expire_seconds_for_application_settings.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddSessionExpireSecondsForApplicationSettings < ActiveRecord::Migration
- def change
- add_column :application_settings, :session_expire_seconds, :integer, default: 604800, null: false
- end
-end \ No newline at end of file
diff --git a/db/migrate/20150609141121_add_session_expire_delay_for_application_settings.rb b/db/migrate/20150609141121_add_session_expire_delay_for_application_settings.rb
new file mode 100644
index 00000000000..ffa22e6d5ef
--- /dev/null
+++ b/db/migrate/20150609141121_add_session_expire_delay_for_application_settings.rb
@@ -0,0 +1,5 @@
+class AddSessionExpireDelayForApplicationSettings < ActiveRecord::Migration
+ def change
+ add_column :application_settings, :session_expire_delay, :integer, default: 10080, null: false
+ end
+end \ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index d2ad55d7a99..04f887274de 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -35,7 +35,7 @@ ActiveRecord::Schema.define(version: 20150604202921) do
t.text "restricted_signup_domains"
t.boolean "user_oauth_applications", default: true
t.string "after_sign_out_path"
- t.integer "session_expire_seconds", default: 604800, null: false
+ t.integer "session_expire_delay", default: 10080, null: false
end
create_table "broadcast_messages", force: true do |t|