Revert "Merge branch '8836-mr-revert' into 'master'

This reverts commit 68e40bd49fde7b790bb31b9ac85a249bedd817d2, reversing
changes made to 2d1f823b4c8b60cee525384cb52e547d2be8925a.

2 files changed, 15 insertions, 0 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
new file mode 100644
index 00000000000..f90637e1e35
--- /dev/null
+++ b/db/migrate/20170123061730_add_notified_of_own_activity_to_users.rb
@@ -0,0 +1,14 @@
+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 3bef910c1d6..9041ddc306f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1318,6 +1318,7 @@ 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"
   end