summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIllya Klymov <xanf@xanf.me>2019-08-27 15:54:02 +0300
committerIllya Klymov <xanf@xanf.me>2019-09-03 15:05:29 +0300
commit78d6c359901294e73f5ca44842f3474ae483e3e8 (patch)
tree869fe7a8fef3437dd140ae47e9b838873ec4627d
parentda0a5c7cc20194b71c41bd5572717fd9ac382cf4 (diff)
downloadgitlab-ce-ce-66649-signup-not-disabled.tar.gz
Fix signup link in admin area not being disabledce-66649-signup-not-disabled
-rw-r--r--app/views/admin/dashboard/index.html.haml2
-rw-r--r--changelogs/unreleased/ce-66649-signup-not-disabled.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 8aca61efe7b..747d8b8346c 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -74,7 +74,7 @@
.info-well
.well-segment.admin-well.admin-well-features
%h4 Features
- = feature_entry(_('Sign up'), href: admin_application_settings_path(anchor: 'js-signup-settings'))
+ = feature_entry(_('Sign up'), href: admin_application_settings_path(anchor: 'js-signup-settings'), enabled: allow_signup?)
= feature_entry(_('LDAP'), enabled: Gitlab.config.ldap.enabled)
= feature_entry(_('Gravatar'), href: admin_application_settings_path(anchor: 'js-account-settings'), enabled: gravatar_enabled?)
= feature_entry(_('OmniAuth'), href: admin_application_settings_path(anchor: 'js-signin-settings'), enabled: Gitlab::Auth.omniauth_enabled?)
diff --git a/changelogs/unreleased/ce-66649-signup-not-disabled.yml b/changelogs/unreleased/ce-66649-signup-not-disabled.yml
new file mode 100644
index 00000000000..6a1f3955b22
--- /dev/null
+++ b/changelogs/unreleased/ce-66649-signup-not-disabled.yml
@@ -0,0 +1,5 @@
+---
+title: Fix signup link in admin area not being disabled
+merge_request: 32266
+author: Illya Klymov
+type: fixed