Commit 61ed9239 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'mk/follow-up-fix-default-project-creation-migration' into 'master'

Fix default_project_creation already exists

See merge request gitlab-org/gitlab-ce!27144
parents 225edb0d c64775e2
...@@ -6,10 +6,14 @@ class AddDefaultProjectCreationSetting < ActiveRecord::Migration[4.2] ...@@ -6,10 +6,14 @@ class AddDefaultProjectCreationSetting < ActiveRecord::Migration[4.2]
disable_ddl_transaction! disable_ddl_transaction!
def up def up
unless column_exists?(:application_settings, :default_project_creation)
add_column_with_default(:application_settings, :default_project_creation, :integer, default: 2) add_column_with_default(:application_settings, :default_project_creation, :integer, default: 2)
end end
end
def down def down
if column_exists?(:application_settings, :default_project_creation)
remove_column(:application_settings, :default_project_creation) remove_column(:application_settings, :default_project_creation)
end end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment