Merge branch 'backport-add-default-project-creation-setting-ee' into 'master'

Backport `add_default_project_creation_setting` to CE

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

ee/db/migrate/20180115094742_add_default_project_creation_setting.rb → db/migrate/20180115094742_add_default_project_creation_setting.rb

@@ -6,14 +6,10 @@ class AddDefaultProjectCreationSetting < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up
-    unless column_exists?(:application_settings, :default_project_creation)
-      add_column_with_default(:application_settings, :default_project_creation, :integer, default: 2)
-    end
+    add_column_with_default(:application_settings, :default_project_creation, :integer, default: 2)
   end
 
   def down
-    if column_exists?(:application_settings, :default_project_creation)
-      remove_column(:application_settings, :default_project_creation)
-    end
+    remove_column(:application_settings, :default_project_creation)
   end
 end

db/migrate/20190311132500_add_default_project_creation_application_setting.rb

-# frozen_string_literal: true
-
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
-class AddDefaultProjectCreationApplicationSetting < ActiveRecord::Migration[5.0]
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-
-  def up
-    unless column_exists?(:application_settings, :default_project_creation)
-      add_column(:application_settings, :default_project_creation, :integer, default: 2, null: false)
-    end
-  end
-
-  def down
-    if column_exists?(:application_settings, :default_project_creation)
-      remove_column(:application_settings, :default_project_creation)
-    end
-  end
-end