Commit f08ab6a3 authored by Drew Blessing's avatar Drew Blessing Committed by Drew Blessing

Fix LDAP group settings heading being shown when feature disabled

The 'LDAP Group Settings' heading was previously displayed even
when the partial content was not shown because the feature was
disabled.
parent 4a1667c4
- 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
- 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'
---
title: Fix LDAP group settings heading being shown when feature disabled
merge_request: 43901
author:
type: fixed
......@@ -14606,6 +14606,9 @@ msgstr ""
msgid "LDAP Synchronization"
msgstr ""
msgid "LDAP group settings"
msgstr ""
msgid "LDAP settings"
msgstr ""
......@@ -14615,6 +14618,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 ""
......
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