diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-20 14:05:44 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-02-20 14:05:44 +0100 |
| commit | 2b0e8b86d8aa35ac094d18bfefaa81af916347fa (patch) | |
| tree | a0469ccf9e179832b2231c7f2abfa23956a4048f /db | |
| parent | 444d71e043eb19979ec1b08504b2760910cb2a47 (diff) | |
| parent | c89449e6110c2bdf6e1410bae3e7b7d807c5e305 (diff) | |
| download | gitlab-ce-2b0e8b86d8aa35ac094d18bfefaa81af916347fa.tar.gz | |
Merge branch 'master' into zj-create-mattermost-team
Diffstat (limited to 'db')
| -rw-r--r-- | db/fixtures/development/18_abuse_reports.rb | 5 | ||||
| -rw-r--r-- | db/post_migrate/20170215200045_remove_theme_id_from_users.rb | 9 | ||||
| -rw-r--r-- | db/schema.rb | 5 |
3 files changed, 16 insertions, 3 deletions
diff --git a/db/fixtures/development/18_abuse_reports.rb b/db/fixtures/development/18_abuse_reports.rb new file mode 100644 index 00000000000..8618d10387a --- /dev/null +++ b/db/fixtures/development/18_abuse_reports.rb @@ -0,0 +1,5 @@ +require 'factory_girl_rails' + +(AbuseReport.default_per_page + 3).times do + FactoryGirl.create(:abuse_report) +end 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 0ae208fb5e4..66863942b77 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" @@ -1248,7 +1248,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" @@ -1362,4 +1361,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 |