Commit be7be557 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'rs-issue-119' into 'master'

Don't render Linked LDAP groups forms when LDAP is disabled

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/119

See merge request !283
parents 2fd9ae8b b395309f
......@@ -24,7 +24,7 @@
= f.submit 'Save changes', class: "btn btn-save"
= link_to 'Cancel', admin_group_path(@group), class: "btn btn-cancel"
- if @group.persisted?
- if ldap_enabled? && @group.persisted?
%h3.page-title Linked LDAP groups
= render 'ldap_group_links/form', group: @group
= render 'ldap_group_links/ldap_group_links', group: @group
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