summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-03-15 11:50:20 -0700
committerStan Hu <stanhu@gmail.com>2017-03-15 11:51:08 -0700
commit203bb0bc546cfa99272a858426904030d9292615 (patch)
tree18f68a88f9225b054e96992040bb69ddf09b0400 /db
parentba9ea195f87a99ffa2662c8f273599f16dca4478 (diff)
downloadgitlab-ce-203bb0bc546cfa99272a858426904030d9292615.tar.gz
Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'
This reverts commit 5e9666880376b3f53edb95cba77b5642d3cc1810, reversing changes made to b35378a938e22f745b6c6ea32b53cb50f9b6c627.
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20170123061730_add_notified_of_own_activity_to_users.rb14
-rw-r--r--db/schema.rb1
2 files changed, 0 insertions, 15 deletions
diff --git a/db/migrate/20170123061730_add_notified_of_own_activity_to_users.rb b/db/migrate/20170123061730_add_notified_of_own_activity_to_users.rb
deleted file mode 100644
index f90637e1e35..00000000000
--- a/db/migrate/20170123061730_add_notified_of_own_activity_to_users.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class AddNotifiedOfOwnActivityToUsers < ActiveRecord::Migration
- include Gitlab::Database::MigrationHelpers
- disable_ddl_transaction!
-
- DOWNTIME = false
-
- def up
- add_column_with_default :users, :notified_of_own_activity, :boolean, default: false
- end
-
- def down
- remove_column :users, :notified_of_own_activity
- end
-end
diff --git a/db/schema.rb b/db/schema.rb
index ca88198079f..612a86c2612 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1318,7 +1318,6 @@ ActiveRecord::Schema.define(version: 20170313133418) 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"
end