Merge branch 'djensen-remove-optional-from-input-label' into 'master'

Remove optional languge from Compliance framework label

See merge request gitlab-org/gitlab!68304

ee/app/views/compliance_management/compliance_framework/_project_settings.html.haml

@@ -12,20 +12,17 @@
       - frameworks = @project.namespace.root_ancestor.compliance_management_frameworks
 
       .form-group
-        - if user_has_edit_permissions
-          = f.fields_for :compliance_framework_setting, ComplianceManagement::ComplianceFramework::ProjectSettings.new do |cf|
-            = cf.label :framework, class: 'gl-font-weight-bold' do
-              = _('Compliance framework (optional)')
+        = f.fields_for :compliance_framework_setting, ComplianceManagement::ComplianceFramework::ProjectSettings.new do |cf|
+          = cf.label :framework, class: 'gl-font-weight-bold' do
+            = _('Compliance framework')
+          - if user_has_edit_permissions
             - if frameworks.any?
               - selected_default_framework = @project.compliance_framework_setting&.compliance_management_framework&.id
               = cf.select :framework, options_for_select(frameworks.map { |fw| [fw.name.truncate(88), fw.id] }, selected_default_framework), { selected: '', prompt: _('Choose your framework'), include_blank: _('None') }, { class: 'form-control', disabled: false }
             - else
               %p.form-text.text-muted
                 = _("No compliance frameworks are in use. Create one from the %{link} section in Group Settings.").html_safe % { link: link_to('Compliance frameworks', edit_group_path(@project.namespace.root_ancestor)).html_safe }
-        - else
-          = f.fields_for :compliance_framework_setting, ComplianceManagement::ComplianceFramework::ProjectSettings.new do |cf|
-            = cf.label :framework, class: 'gl-font-weight-bold' do
-              = _('Compliance framework')
+          - else
             - if frameworks.any?
               - selected_framework = @project.compliance_framework_setting&.compliance_management_framework&.name&.truncate(88) || _('None')
               = cf.text_field :framework, value: selected_framework, class: 'form-control read-only', disabled: true

locale/gitlab.pot

@@ -8356,9 +8356,6 @@ msgstr ""
 msgid "Compliance framework"
 msgstr ""
 
-msgid "Compliance framework (optional)"
-msgstr ""
-
 msgid "ComplianceDashboard|created by:"
 msgstr ""