Merge branch 'revert-2f46c3a8' into 'master'

Revert "Merge branch 'revert-f2421b2b' into 'master'"

See merge request !14190

2 files changed, 11 insertions, 0 deletions

diff --git a/db/migrate/20170816234252_add_theme_id_to_users.rb b/db/migrate/20170816234252_add_theme_id_to_users.rb
new file mode 100644
index 00000000000..5043f9ec591
--- /dev/null
+++ b/db/migrate/20170816234252_add_theme_id_to_users.rb
@@ -0,0 +1,10 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddThemeIdToUsers < ActiveRecord::Migration
+  DOWNTIME = false
+
+  def change
+    add_column :users, :theme_id, :integer, limit: 2
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index df941afa7d7..2149f5ad23d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1608,6 +1608,7 @@ ActiveRecord::Schema.define(version: 20170905112933) do
     t.boolean "notified_of_own_activity"
     t.string "preferred_language"
     t.string "rss_token"
+    t.integer "theme_id", limit: 2
   end
 
   add_index "users", ["admin"], name: "index_users_on_admin", using: :btree