diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-04-09 12:26:45 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-04-09 12:26:45 +0000 |
| commit | 41adfde8ffa34eb45bd1d6f15ad6e80c8ef0f8a9 (patch) | |
| tree | a3ef1f7d754a72f30abc76375c30fc0b65e611cc | |
| parent | 17930da4eef0d72ec90f9271929a08c0ca7cbc70 (diff) | |
| parent | d3ae4976dd1826d3a325f6e98e10900b00cb3dc6 (diff) | |
| download | gitlab-ce-54404-add-a-custom-commit-message-when-applying-a-suggested-change.tar.gz | |
Merge branch 'fix-project-creation-level' into 'master'54404-add-a-custom-commit-message-when-applying-a-suggested-change
Fix backport of project_creation_level migration
See merge request gitlab-org/gitlab-ce!27167
| -rw-r--r-- | db/migrate/20180115113902_add_project_creation_level_to_groups.rb | 17 | ||||
| -rw-r--r-- | db/migrate/20190311132527_add_project_creation_level_to_namespaces.rb | 22 |
2 files changed, 17 insertions, 22 deletions
diff --git a/db/migrate/20180115113902_add_project_creation_level_to_groups.rb b/db/migrate/20180115113902_add_project_creation_level_to_groups.rb new file mode 100644 index 00000000000..a10ce54087c --- /dev/null +++ b/db/migrate/20180115113902_add_project_creation_level_to_groups.rb @@ -0,0 +1,17 @@ +class AddProjectCreationLevelToGroups < ActiveRecord::Migration[4.2] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + unless column_exists?(:namespaces, :project_creation_level) + add_column(:namespaces, :project_creation_level, :integer) + end + end + + def down + if column_exists?(:namespaces, :project_creation_level) + remove_column(:namespaces, :project_creation_level, :integer) + end + end +end diff --git a/db/migrate/20190311132527_add_project_creation_level_to_namespaces.rb b/db/migrate/20190311132527_add_project_creation_level_to_namespaces.rb deleted file mode 100644 index 159e0a95ace..00000000000 --- a/db/migrate/20190311132527_add_project_creation_level_to_namespaces.rb +++ /dev/null @@ -1,22 +0,0 @@ -# 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 AddProjectCreationLevelToNamespaces < ActiveRecord::Migration[5.0] - include Gitlab::Database::MigrationHelpers - - DOWNTIME = false - - def up - unless column_exists?(:namespaces, :project_creation_level) - add_column :namespaces, :project_creation_level, :integer - end - end - - def down - unless column_exists?(:namespaces, :project_creation_level) - remove_column :namespaces, :project_creation_level, :integer - end - end -end |