diff options
Diffstat (limited to 'lib/gitlab/database/migration_helpers/cascading_namespace_settings.rb')
| -rw-r--r-- | lib/gitlab/database/migration_helpers/cascading_namespace_settings.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/gitlab/database/migration_helpers/cascading_namespace_settings.rb b/lib/gitlab/database/migration_helpers/cascading_namespace_settings.rb index eecf96acb30..d9ef5ab462e 100644 --- a/lib/gitlab/database/migration_helpers/cascading_namespace_settings.rb +++ b/lib/gitlab/database/migration_helpers/cascading_namespace_settings.rb @@ -31,10 +31,8 @@ module Gitlab namespace_options = options.merge(null: true, default: nil) - with_lock_retries do - add_column(:namespace_settings, setting_name, type, namespace_options) - add_column(:namespace_settings, lock_column_name, :boolean, default: false, null: false) - end + add_column(:namespace_settings, setting_name, type, namespace_options) + add_column(:namespace_settings, lock_column_name, :boolean, default: false, null: false) add_column(:application_settings, setting_name, type, options) add_column(:application_settings, lock_column_name, :boolean, default: false, null: false) @@ -43,10 +41,8 @@ module Gitlab def remove_cascading_namespace_setting(setting_name) lock_column_name = "lock_#{setting_name}".to_sym - with_lock_retries do - remove_column(:namespace_settings, setting_name) if column_exists?(:namespace_settings, setting_name) - remove_column(:namespace_settings, lock_column_name) if column_exists?(:namespace_settings, lock_column_name) - end + remove_column(:namespace_settings, setting_name) if column_exists?(:namespace_settings, setting_name) + remove_column(:namespace_settings, lock_column_name) if column_exists?(:namespace_settings, lock_column_name) remove_column(:application_settings, setting_name) if column_exists?(:application_settings, setting_name) remove_column(:application_settings, lock_column_name) if column_exists?(:application_settings, lock_column_name) |