diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-02-06 14:48:53 +0300 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-02-06 14:48:53 +0300 |
commit | 999edc5c1783aa205fdac4ba159e51851acdb446 (patch) | |
tree | a96ea40dd7b4ca60dab0d4c6869606ca10609729 /db | |
parent | dcf9af6c1258b438d91727e824589e52e43d344c (diff) | |
parent | 5d3816652e13cde6bf5e9de814d2c9d1e6593601 (diff) |
Merge branch 'terminal-max-session-time' into 'master'
Introduce maximum session time for terminal websocket connection
Closes #26263
See merge request !8413
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20170126174819_add_terminal_max_session_time_to_application_settings.rb | 33 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/db/migrate/20170126174819_add_terminal_max_session_time_to_application_settings.rb b/db/migrate/20170126174819_add_terminal_max_session_time_to_application_settings.rb new file mode 100644 index 00000000000..334f53f9145 --- /dev/null +++ b/db/migrate/20170126174819_add_terminal_max_session_time_to_application_settings.rb @@ -0,0 +1,33 @@ +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddTerminalMaxSessionTimeToApplicationSettings < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + # Set this constant to true if this migration requires downtime. + DOWNTIME = false + + # When a migration requires downtime you **must** uncomment the following + # constant and define a short and easy to understand explanation as to why the + # migration requires downtime. + # DOWNTIME_REASON = '' + + # When using the methods "add_concurrent_index" or "add_column_with_default" + # you must disable the use of transactions as these methods can not run in an + # existing transaction. When using "add_concurrent_index" make sure that this + # method is the _only_ method called in the migration, any other changes + # should go in a separate migration. This ensures that upon failure _only_ the + # index creation fails and can be retried or reverted easily. + # + # To disable transactions uncomment the following line and remove these + # comments: + disable_ddl_transaction! + + def up + add_column_with_default :application_settings, :terminal_max_session_time, :integer, default: 0, allow_null: false + end + + def down + remove_column :application_settings, :terminal_max_session_time + end +end diff --git a/db/schema.rb b/db/schema.rb index 92b36218a15..a9f4e865d60 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -109,6 +109,7 @@ ActiveRecord::Schema.define(version: 20170204181513) do t.boolean "html_emails_enabled", default: true t.string "plantuml_url" t.boolean "plantuml_enabled" + t.integer "terminal_max_session_time", default: 0, null: false end create_table "audit_events", force: :cascade do |t| |