Merge branch 'master' into 'focus-mode-board'focus-mode-board

# Conflicts:
#   app/views/shared/issuable/_filter.html.haml

1 files changed, 24 insertions, 0 deletions

diff --git a/db/migrate/20170315174634_revert_add_notified_of_own_activity_to_users.rb b/db/migrate/20170315174634_revert_add_notified_of_own_activity_to_users.rb
new file mode 100644
index 00000000000..b39c0a3be0f
--- /dev/null
+++ b/db/migrate/20170315174634_revert_add_notified_of_own_activity_to_users.rb
@@ -0,0 +1,24 @@
+class RevertAddNotifiedOfOwnActivityToUsers < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+  disable_ddl_transaction!
+
+  DOWNTIME = false
+
+  def up
+    if our_column_exists?
+      remove_column :users, :notified_of_own_activity
+    end
+  end
+
+  def down
+    unless our_column_exists?
+      add_column_with_default :users, :notified_of_own_activity, :boolean, default: false
+    end
+  end
+
+  private
+
+  def our_column_exists?
+    column_exists?(:users, :notified_of_own_activity)
+  end
+end