Commit ed266170 authored by James Fargher's avatar James Fargher

Remove store accessor for repository_storages_weighted

Now that the form no longer uses these accessors they can be removed.
parent 7662f923
...@@ -237,7 +237,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController ...@@ -237,7 +237,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
[ [
*::ApplicationSettingsHelper.visible_attributes, *::ApplicationSettingsHelper.visible_attributes,
*::ApplicationSettingsHelper.external_authorization_service_attributes, *::ApplicationSettingsHelper.external_authorization_service_attributes,
*ApplicationSetting.repository_storages_weighted_attributes,
*ApplicationSetting.kroki_formats_attributes.keys.map { |key| "kroki_formats_#{key}".to_sym }, *ApplicationSetting.kroki_formats_attributes.keys.map { |key| "kroki_formats_#{key}".to_sym },
:lets_encrypt_notification_email, :lets_encrypt_notification_email,
:lets_encrypt_terms_of_service_accepted, :lets_encrypt_terms_of_service_accepted,
...@@ -248,7 +247,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController ...@@ -248,7 +247,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:default_branch_name, :default_branch_name,
disabled_oauth_sign_in_sources: [], disabled_oauth_sign_in_sources: [],
import_sources: [], import_sources: [],
repository_storages: [],
restricted_visibility_levels: [], restricted_visibility_levels: [],
repository_storages_weighted: {} repository_storages_weighted: {}
] ]
......
...@@ -25,10 +25,6 @@ class ApplicationSetting < ApplicationRecord ...@@ -25,10 +25,6 @@ class ApplicationSetting < ApplicationRecord
alias_attribute :instance_group_id, :instance_administrators_group_id alias_attribute :instance_group_id, :instance_administrators_group_id
alias_attribute :instance_administrators_group, :instance_group alias_attribute :instance_administrators_group, :instance_group
def self.repository_storages_weighted_attributes
@repository_storages_weighted_atributes ||= Gitlab.config.repositories.storages.keys.map { |k| "repository_storages_weighted_#{k}".to_sym }.freeze
end
def self.kroki_formats_attributes def self.kroki_formats_attributes
{ {
blockdiag: { blockdiag: {
...@@ -44,7 +40,6 @@ class ApplicationSetting < ApplicationRecord ...@@ -44,7 +40,6 @@ class ApplicationSetting < ApplicationRecord
end end
store_accessor :kroki_formats, *ApplicationSetting.kroki_formats_attributes.keys, prefix: true store_accessor :kroki_formats, *ApplicationSetting.kroki_formats_attributes.keys, prefix: true
store_accessor :repository_storages_weighted, *Gitlab.config.repositories.storages.keys, prefix: true
# Include here so it can override methods from # Include here so it can override methods from
# `add_authentication_token_field` # `add_authentication_token_field`
...@@ -583,12 +578,6 @@ class ApplicationSetting < ApplicationRecord ...@@ -583,12 +578,6 @@ class ApplicationSetting < ApplicationRecord
recaptcha_enabled || login_recaptcha_protection_enabled recaptcha_enabled || login_recaptcha_protection_enabled
end end
repository_storages_weighted_attributes.each do |attribute|
define_method :"#{attribute}=" do |value|
super(value.to_i)
end
end
kroki_formats_attributes.keys.each do |key| kroki_formats_attributes.keys.each do |key|
define_method :"kroki_formats_#{key}=" do |value| define_method :"kroki_formats_#{key}=" do |value|
super(::Gitlab::Utils.to_boolean(value)) super(::Gitlab::Utils.to_boolean(value))
......
...@@ -144,10 +144,10 @@ RSpec.describe Admin::ApplicationSettingsController do ...@@ -144,10 +144,10 @@ RSpec.describe Admin::ApplicationSettingsController do
end end
it 'updates repository_storages_weighted setting' do it 'updates repository_storages_weighted setting' do
put :update, params: { application_setting: { repository_storages_weighted_default: 75 } } put :update, params: { application_setting: { repository_storages_weighted: { default: 75 } } }
expect(response).to redirect_to(general_admin_application_settings_path) expect(response).to redirect_to(general_admin_application_settings_path)
expect(ApplicationSetting.current.repository_storages_weighted_default).to eq(75) expect(ApplicationSetting.current.repository_storages_weighted).to eq('default' => 75)
end end
it 'updates kroki_formats setting' do it 'updates kroki_formats setting' do
......
...@@ -958,12 +958,6 @@ RSpec.describe ApplicationSetting do ...@@ -958,12 +958,6 @@ RSpec.describe ApplicationSetting do
it_behaves_like 'application settings examples' it_behaves_like 'application settings examples'
describe 'repository_storages_weighted_attributes' do
it 'returns the keys for repository_storages_weighted' do
expect(subject.class.repository_storages_weighted_attributes).to eq([:repository_storages_weighted_default])
end
end
describe 'kroki_format_supported?' do describe 'kroki_format_supported?' do
it 'returns true when Excalidraw is enabled' do it 'returns true when Excalidraw is enabled' do
subject.kroki_formats_excalidraw = true subject.kroki_formats_excalidraw = true
......
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