Commit c85fdf2c authored by Andreas Brandl's avatar Andreas Brandl

Merge branch 'blacklist-project-ci-cd-settings-table' into 'master'

Blacklists project_ci_cd_settings table

See merge request gitlab-org/gitlab!23708
parents 99048589 f3c83510
...@@ -7,9 +7,13 @@ class AddMergeTrainEnabledToCiCdSettings < ActiveRecord::Migration[5.1] ...@@ -7,9 +7,13 @@ class AddMergeTrainEnabledToCiCdSettings < ActiveRecord::Migration[5.1]
disable_ddl_transaction! disable_ddl_transaction!
# rubocop:disable Migration/UpdateLargeTable
# rubocop:disable Migration/AddColumnWithDefault
def up def up
add_column_with_default :project_ci_cd_settings, :merge_trains_enabled, :boolean, default: false, allow_null: false # rubocop:disable Migration/AddColumnWithDefault add_column_with_default :project_ci_cd_settings, :merge_trains_enabled, :boolean, default: false, allow_null: false
end end
# rubocop:enable Migration/UpdateLargeTable
# rubocop:enable Migration/AddColumnWithDefault
def down def down
remove_column :project_ci_cd_settings, :merge_trains_enabled remove_column :project_ci_cd_settings, :merge_trains_enabled
......
...@@ -12,6 +12,6 @@ class DropProjectCiCdSettingsMergeTrainsEnabled < ActiveRecord::Migration[5.2] ...@@ -12,6 +12,6 @@ class DropProjectCiCdSettingsMergeTrainsEnabled < ActiveRecord::Migration[5.2]
end end
def down def down
add_column_with_default :project_ci_cd_settings, :merge_trains_enabled, :boolean, default: false, allow_null: true add_column_with_default :project_ci_cd_settings, :merge_trains_enabled, :boolean, default: false, allow_null: true # rubocop:disable Migration/UpdateLargeTable
end end
end end
...@@ -34,6 +34,7 @@ module RuboCop ...@@ -34,6 +34,7 @@ module RuboCop
namespaces namespaces
notes notes
projects projects
project_ci_cd_settings
routes routes
users users
].freeze ].freeze
......
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