From 8e5ffdde6ff1794288953090753e88a742d58216 Mon Sep 17 00:00:00 2001 From: Jeremy Lenz Date: Mon, 14 Aug 2023 16:35:58 -0400 Subject: [PATCH] Fixes #36654 - Remove dead content_view_solve_dependencies setting (#10687) --- engines/bastion/app/views/bastion/layouts/assets.html.erb | 1 - lib/katello/plugin.rb | 6 ------ 2 files changed, 7 deletions(-) diff --git a/engines/bastion/app/views/bastion/layouts/assets.html.erb b/engines/bastion/app/views/bastion/layouts/assets.html.erb index 7fd68605a06..822828d43d1 100644 --- a/engines/bastion/app/views/bastion/layouts/assets.html.erb +++ b/engines/bastion/app/views/bastion/layouts/assets.html.erb @@ -25,7 +25,6 @@ angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson(`<%= Setting[:unregister_delete_host] %>`)); angular.module('Bastion').value('globalContentProxy', angular.fromJson(`<%= Setting[:content_default_http_proxy].empty? ? nil.to_json : Setting[:content_default_http_proxy].to_json.html_safe %>`)); angular.module('Bastion').value('entriesPerPage', "<%= Setting[:entries_per_page] %>"); - angular.module('Bastion').value('contentViewSolveDependencies', "<%= Setting[:content_view_solve_dependencies] %>"); angular.module('Bastion').constant('BastionConfig', angular.fromJson(`<%= Bastion.config.to_json.html_safe %>`)); angular.module('Bastion.auth').value('CurrentUser', { id: <%= User.current.id %>, diff --git a/lib/katello/plugin.rb b/lib/katello/plugin.rb index 95c2b50f909..e5b4ed8aab1 100644 --- a/lib/katello/plugin.rb +++ b/lib/katello/plugin.rb @@ -612,12 +612,6 @@ def katello_template_setting_values(name) full_name: N_('Expire soon days'), description: N_('The number of days remaining in a subscription before you will be reminded about renewing it.') - setting 'content_view_solve_dependencies', - type: :boolean, - default: false, - full_name: N_('content view Dependency Solving Default'), - description: N_('The default dependency solving value for new content views.') - setting 'host_dmi_uuid_duplicates', type: :array, default: [],