diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-03-16 20:23:15 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-03-16 20:24:16 -0700 |
| commit | 9b475bcce2497532081281f8a12d76c20c5473ef (patch) | |
| tree | 3fea357092b5b155af1799969e05511d40da8144 | |
| parent | 7cad597f6c8ba794c6852e23d718ed7827da35c6 (diff) | |
| download | gitlab-ce-sh-bring-back-option-to-be-notified-of-own-activity.tar.gz | |
Remove original migration and re-add required migration under a later timestampsh-bring-back-option-to-be-notified-of-own-activity
| -rw-r--r-- | db/migrate/20170316061730_readd_notified_of_own_activity_to_users.rb (renamed from db/migrate/20170123061730_add_notified_of_own_activity_to_users.rb) | 2 | ||||
| -rw-r--r-- | db/schema.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/db/migrate/20170123061730_add_notified_of_own_activity_to_users.rb b/db/migrate/20170316061730_readd_notified_of_own_activity_to_users.rb index f90637e1e35..a96193d3da6 100644 --- a/db/migrate/20170123061730_add_notified_of_own_activity_to_users.rb +++ b/db/migrate/20170316061730_readd_notified_of_own_activity_to_users.rb @@ -1,4 +1,4 @@ -class AddNotifiedOfOwnActivityToUsers < ActiveRecord::Migration +class ReaddNotifiedOfOwnActivityToUsers < ActiveRecord::Migration include Gitlab::Database::MigrationHelpers disable_ddl_transaction! diff --git a/db/schema.rb b/db/schema.rb index 9041ddc306f..fe59c090056 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: 20170315174634) do +ActiveRecord::Schema.define(version: 20170316061730) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1318,8 +1318,8 @@ ActiveRecord::Schema.define(version: 20170315174634) do t.string "incoming_email_token" t.string "organization" t.boolean "authorized_projects_populated" - t.boolean "notified_of_own_activity", default: false, null: false t.boolean "ghost" + t.boolean "notified_of_own_activity", default: false, null: false end add_index "users", ["admin"], name: "index_users_on_admin", using: :btree |