Commit 86ecdb62 authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'fix_auto_loading_issue' into 'master'

Explicitly require the ComplianceManagement::ComplianceFramework dependency

See merge request gitlab-org/gitlab!34843
parents daa1639e 1345c0a3
# frozen_string_literal: true # frozen_string_literal: true
require_dependency 'compliance_management/compliance_framework'
module ComplianceManagement module ComplianceManagement
module ComplianceFramework module ComplianceFramework
module ProjectSettingsHelper module ProjectSettingsHelper
...@@ -64,7 +66,7 @@ module ComplianceManagement ...@@ -64,7 +66,7 @@ module ComplianceManagement
def compliance_framework_tooltip_values def compliance_framework_tooltip_values
@compliance_framework_tooltip_values ||= @compliance_framework_tooltip_values ||=
compliance_framework_title_values.map { |k, v| [k, get_compliance_framework_tooltip(v)] }.to_h compliance_framework_title_values.transform_values { |v| get_compliance_framework_tooltip(v) }
end end
def get_compliance_framework_tooltip(framework) def get_compliance_framework_tooltip(framework)
......
# frozen_string_literal: true # frozen_string_literal: true
require_dependency 'compliance_management/compliance_framework'
module ComplianceManagement module ComplianceManagement
module ComplianceFramework module ComplianceFramework
class ProjectSettings < ApplicationRecord class ProjectSettings < ApplicationRecord
......
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