Merge branch 'option-to-be-notified-of-own-activity' into 'master'

Add option to receive email notifications about your own activity

See merge request !8836

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 feeea55ce9b..d421d5c6774 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1279,6 +1279,7 @@ ActiveRecord::Schema.define(version: 20170210075922) do
     t.string "organization"
     t.string "incoming_email_token"
     t.boolean "authorized_projects_populated"
+    t.boolean "notified_of_own_activity", default: false, null: false
   end
 
   add_index "users", ["admin"], name: "index_users_on_admin", using: :btree