Merge branch 'dblessing_ldap_sync_view_conditional' into 'master'

Fix LDAP group settings heading being shown when feature disabled

See merge request gitlab-org/gitlab!43901

ee/app/views/groups/ldap_group_links/index.html.haml

 - page_title _('LDAP Synchronization')
-%h3.page-title LDAP Group Settings
-= render 'groups/ldap_group_settings/form', group: @group
+- if Feature.enabled?(:ldap_settings_unlock_groups_by_owners) && ::Gitlab::CurrentSettings.allow_group_owners_to_manage_ldap
+  %h3.page-title= _('LDAP group settings')
+  = render 'groups/ldap_group_settings/form', group: @group
 
-%h3.page-title LDAP synchronizations
+%h3.page-title= _('LDAP synchronizations')
 = render 'ldap_group_links/form', group: @group
 = render 'ldap_group_links/ldap_group_links', group: @group

ee/app/views/groups/ldap_group_settings/_form.html.haml

-- if Feature.enabled?(:ldap_settings_unlock_groups_by_owners) && ::Gitlab::CurrentSettings.allow_group_owners_to_manage_ldap
-  %section.ldap-group-settings
-    = form_for(group, url: group_ldap_settings_url(group), method: :put) do |f|
-      .form-holder
-        .form-group.row
-          .col-sm-10
-            .form-check
-              = f.check_box :unlock_membership_to_ldap, class: 'form-check-input'
-              = f.label :unlock_membership_to_ldap, class: 'form-check-label' do
-                = _('Allow owners to manually add users outside of LDAP')
-      .form-actions
-        = f.submit _('Save'), class: 'btn btn-success qa-save'
+%section.ldap-group-settings
+  = form_for(group, url: group_ldap_settings_url(group), method: :put) do |f|
+    .form-holder
+      .form-group.row
+        .col-sm-10
+          .form-check
+            = f.check_box :unlock_membership_to_ldap, class: 'form-check-input'
+            = f.label :unlock_membership_to_ldap, class: 'form-check-label' do
+              = _('Allow owners to manually add users outside of LDAP')
+    .form-actions
+      = f.submit _('Save'), class: 'btn btn-success qa-save'

ee/changelogs/unreleased/dblessing_ldap_sync_view_conditional.yml

+---
+title: Fix LDAP group settings heading being shown when feature disabled
+merge_request: 43901
+author:
+type: fixed

locale/gitlab.pot

@@ -14651,6 +14651,9 @@ msgstr ""
 msgid "LDAP Synchronization"
 msgstr ""
 
+msgid "LDAP group settings"
+msgstr ""
+
 msgid "LDAP settings"
 msgstr ""
 
@@ -14660,6 +14663,9 @@ msgstr ""
 msgid "LDAP sync in progress. This could take a few minutes. Refresh the page to see the changes."
 msgstr ""
 
+msgid "LDAP synchronizations"
+msgstr ""
+
 msgid "LFS"
 msgstr ""