diff --git a/modules/storages/app/components/storages/admin/edit_form_header_component.html.erb b/modules/storages/app/components/storages/admin/edit_form_header_component.html.erb index c20b615bf8e9..1d0f82b935c1 100644 --- a/modules/storages/app/components/storages/admin/edit_form_header_component.html.erb +++ b/modules/storages/app/components/storages/admin/edit_form_header_component.html.erb @@ -52,20 +52,18 @@ See COPYRIGHT and LICENSE files for more details. I18n.t("button_delete") end - if OpenProject::FeatureDecisions.enable_storage_for_multiple_projects_active? - header.with_tab_nav(label: nil, test_selector: :storage_detail_header) do |tab_nav| - tab_nav.with_tab( - selected: tab_selected?(:edit), - href: edit_admin_settings_storage_path(@storage) - ) do |tab| - tab.with_text { t(:label_details) } - end - tab_nav.with_tab( - selected: tab_selected?(:project_storages), - href: admin_settings_storage_project_storages_path(@storage) - ) do |tab| - tab.with_text { t(:label_project_mappings) } - end + header.with_tab_nav(label: nil, test_selector: :storage_detail_header) do |tab_nav| + tab_nav.with_tab( + selected: tab_selected?(:edit), + href: edit_admin_settings_storage_path(@storage) + ) do |tab| + tab.with_text { t(:label_details) } + end + tab_nav.with_tab( + selected: tab_selected?(:project_storages), + href: admin_settings_storage_project_storages_path(@storage) + ) do |tab| + tab.with_text { t(:label_project_mappings) } end end end diff --git a/modules/storages/lib/open_project/storages/engine.rb b/modules/storages/lib/open_project/storages/engine.rb index e14e88b984fe..d377ec2ffc5b 100644 --- a/modules/storages/lib/open_project/storages/engine.rb +++ b/modules/storages/lib/open_project/storages/engine.rb @@ -52,7 +52,6 @@ def self.permissions initializer "openproject_storages.feature_decisions" do OpenProject::FeatureDecisions.add :storage_file_picking_select_all - OpenProject::FeatureDecisions.add :enable_storage_for_multiple_projects end initializer "openproject_storages.event_subscriptions" do diff --git a/modules/storages/spec/features/storages/admin/project_storages_spec.rb b/modules/storages/spec/features/storages/admin/project_storages_spec.rb index 5454ef395ecd..5c6573a98b51 100644 --- a/modules/storages/spec/features/storages/admin/project_storages_spec.rb +++ b/modules/storages/spec/features/storages/admin/project_storages_spec.rb @@ -35,7 +35,6 @@ # the Angular change detection. This is usually done by the notification polling, but we don't want to wait RSpec.describe "Admin lists project mappings for a storage", :js, :storage_server_helpers, :webmock, :with_cuprite, - with_flag: { enable_storage_for_multiple_projects: true }, with_settings: { notifications_polling_interval: 1_000 } do shared_let(:admin) { create(:admin, preferences: { time_zone: "Etc/UTC" }) } shared_let(:non_admin) { create(:user) }