From 52a2423e373e6552023faaff43ae07dbb7423c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= Date: Fri, 8 Sep 2017 14:48:44 +0000 Subject: Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619 --- db/migrate/20170816234252_add_theme_id_to_users.rb | 10 ---------- db/schema.rb | 1 - 2 files changed, 11 deletions(-) delete mode 100644 db/migrate/20170816234252_add_theme_id_to_users.rb (limited to 'db') diff --git a/db/migrate/20170816234252_add_theme_id_to_users.rb b/db/migrate/20170816234252_add_theme_id_to_users.rb deleted file mode 100644 index 5043f9ec591..00000000000 --- a/db/migrate/20170816234252_add_theme_id_to_users.rb +++ /dev/null @@ -1,10 +0,0 @@ -# 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 2149f5ad23d..df941afa7d7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1608,7 +1608,6 @@ 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 -- cgit v1.2.1