Merge branch 'dm-skip-adding-column-that-may-already-exist' into 'master'

Skip adding column to remote_mirrors that could already exist

Closes gitlab-qa#238

See merge request gitlab-org/gitlab-ee!5652

ee/db/migrate/20171110152729_add_only_protected_branches_to_remote_mirrors.rb

@@ -6,6 +6,9 @@ class AddOnlyProtectedBranchesToRemoteMirrors < ActiveRecord::Migration
   disable_ddl_transaction!
 
   def up
+    # When moving from CE to EE, this column may already exist
+    return if column_exists?(:remote_mirrors, :only_protected_branches)
+
     add_column_with_default(:remote_mirrors, :only_protected_branches, :boolean, default: false, allow_null: false)
   end