diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-17 11:34:09 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-17 11:34:09 +0000 |
| commit | aa792b91bbddeeb61ce77f9525fcaf238a9ad331 (patch) | |
| tree | af0eb491f8bb405955255ab632d15860d6a14906 /db | |
| parent | 5d8f5328baca93b9134f10ae593e71834578a9f8 (diff) | |
| parent | 7203826b54bb3944736057436fe8a13011801ecf (diff) | |
| download | gitlab-ce-aa792b91bbddeeb61ce77f9525fcaf238a9ad331.tar.gz | |
Merge branch '26200-convert-sidebar-to-dropdown' into 'master'
Resolve "Update global sidebar to dropdown"
Closes #26200
See merge request !9199
Diffstat (limited to 'db')
| -rw-r--r-- | db/post_migrate/20170215200045_remove_theme_id_from_users.rb | 9 | ||||
| -rw-r--r-- | db/schema.rb | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/db/post_migrate/20170215200045_remove_theme_id_from_users.rb b/db/post_migrate/20170215200045_remove_theme_id_from_users.rb new file mode 100644 index 00000000000..c51646fbe52 --- /dev/null +++ b/db/post_migrate/20170215200045_remove_theme_id_from_users.rb @@ -0,0 +1,9 @@ +class RemoveThemeIdFromUsers < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + remove_column :users, :theme_id, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 52672406ec6..e0208dab3d3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170214111112) do +ActiveRecord::Schema.define(version: 20170215200045) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1238,7 +1238,6 @@ ActiveRecord::Schema.define(version: 20170214111112) do t.string "linkedin", default: "", null: false t.string "twitter", default: "", null: false t.string "authentication_token" - t.integer "theme_id", default: 1, null: false t.string "bio" t.integer "failed_attempts", default: 0 t.datetime "locked_at" @@ -1351,4 +1350,4 @@ ActiveRecord::Schema.define(version: 20170214111112) do add_foreign_key "timelogs", "merge_requests", name: "fk_timelogs_merge_requests_merge_request_id", on_delete: :cascade add_foreign_key "trending_projects", "projects", on_delete: :cascade add_foreign_key "u2f_registrations", "users" -end
\ No newline at end of file +end |