summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerry Faro <perryfaro@live.nl>2013-09-27 11:56:30 +0200
committerPerry Faro <perryfaro@live.nl>2013-09-27 11:56:30 +0200
commit96ae1a809958450912980407ae2175f2f86f9c55 (patch)
treeb640e615267f792c997e54c0c40bc43b135539b8
parent052a7cc9cdc0fb14a55e7a7d71a8e4696c909658 (diff)
downloadgitlab-ce-96ae1a809958450912980407ae2175f2f86f9c55.tar.gz
Add check if the signup setting is enabled. fixes #4832
-rw-r--r--app/views/devise/shared/_links.erb2
-rw-r--r--config/gitlab.yml.example3
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
index a47b5ff1ec7..db931b86288 100644
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
@@ -2,7 +2,7 @@
<%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br />
<% end -%>
-<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+<%- if devise_mapping.registerable? && controller_name != 'registrations' && Gitlab.config.gitlab.signup_enabled %>
<%= link_to "Sign up", new_registration_path(resource_name) %><br />
<% end -%>
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index c1cc9f872f3..9d535b81c98 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -52,7 +52,8 @@ production: &base
## Users management
- # signup_enabled: true # default: false - Account passwords are not sent via the email if signup is enabled.
+ # default: false - Account passwords are not sent via the email if signup is enabled.
+ # signup_enabled: true
## Automatic issue closing
# If a commit message matches this regular express, all issues referenced from the matched text will be closed