3 files changed, 35 insertions, 0 deletions
diff --git a/db/migrate/20170316061730_readd_notified_of_own_activity_to_users.rb b/db/migrate/20170316061730_readd_notified_of_own_activity_to_users.rb
new file mode 100644
index 00000000000..52c0b682fc8
--- /dev/null
+++ b/db/migrate/20170316061730_readd_notified_of_own_activity_to_users.rb
@@ -0,0 +1,14 @@
+class ReaddNotifiedOfOwnActivityToUsers < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+  disable_ddl_transaction!
+
+  DOWNTIME = false
+
+  def up
+    add_column :users, :notified_of_own_activity, :boolean
+  end
+
+  def down
+    remove_column :users, :notified_of_own_activity
+  end
+end
diff --git a/db/post_migrate/20170317131326_add_notified_of_own_activity_default.rb b/db/post_migrate/20170317131326_add_notified_of_own_activity_default.rb
new file mode 100644
index 00000000000..f01ef6b4119
--- /dev/null
+++ b/db/post_migrate/20170317131326_add_notified_of_own_activity_default.rb
@@ -0,0 +1,20 @@
+class AddNotifiedOfOwnActivityDefault < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+  disable_ddl_transaction!
+
+  DOWNTIME = false
+
+  def up
+    begin
+      update_column_in_batches(:users, :notified_of_own_activity, false) do |table, query|
+        query.where(table[:notified_of_own_activity].eq(nil))
+      end
+
+      change_column :users, :notified_of_own_activity, :boolean, default: false, null: false
+    end
+  end
+
+  def down
+    change_column_default :users, :notified_of_own_activity, nil
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 904fef4a381..47833b7e518 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1236,6 +1236,7 @@ ActiveRecord::Schema.define(version: 20170317203554) do
     t.string "organization"
     t.boolean "authorized_projects_populated"
     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