summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-13 11:50:13 -0600
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-15 13:31:18 -0600
commitc780ad0e926f15ed47acd744df99f89081c8a340 (patch)
treeaa1254259fa8efa2cf9f9cdc177d906b64f6357b /db
parent0667d1aa7f251f5bf11dd121fe2f696107d8103e (diff)
downloadgitlab-ce-c780ad0e926f15ed47acd744df99f89081c8a340.tar.gz
Remove all instances of theme_id; require downtime
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20170213172852_remove_theme_id_from_users.rb2
-rw-r--r--db/schema.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/db/migrate/20170213172852_remove_theme_id_from_users.rb b/db/migrate/20170213172852_remove_theme_id_from_users.rb
index 857f678ad0e..cd6388ab7d2 100644
--- a/db/migrate/20170213172852_remove_theme_id_from_users.rb
+++ b/db/migrate/20170213172852_remove_theme_id_from_users.rb
@@ -5,7 +5,7 @@ class RemoveThemeIdFromUsers < ActiveRecord::Migration
include Gitlab::Database::MigrationHelpers
# Set this constant to true if this migration requires downtime.
- DOWNTIME = false
+ DOWNTIME = true
# When a migration requires downtime you **must** uncomment the following
# constant and define a short and easy to understand explanation as to why the
diff --git a/db/schema.rb b/db/schema.rb
index df065520835..32cbefc2566 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -109,8 +109,8 @@ ActiveRecord::Schema.define(version: 20170213172852) 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
t.integer "max_pages_size", default: 100, null: false
+ t.integer "terminal_max_session_time", default: 0, null: false
end
create_table "audit_events", force: :cascade do |t|