Merge branch 'rs-revert-notified-of-own-activity-migration' into 'master'

db/migrate/20170315174634_revert_add_notified_of_own_activity_to_users.rb

+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

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170306170512) do
+ActiveRecord::Schema.define(version: 20170315174634) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"