diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-30 07:04:40 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-30 07:04:40 -0700 |
| commit | 9ffabc6d7ed0c71d133a29671b50795fb621522c (patch) | |
| tree | 145fc1e264ce1f44e1b63874ea9fc623f142b111 | |
| parent | 715eaed6aecc77512d5c3f99c9cb26c143380fdd (diff) | |
| parent | 96ae1a809958450912980407ae2175f2f86f9c55 (diff) | |
| download | gitlab-ce-9ffabc6d7ed0c71d133a29671b50795fb621522c.tar.gz | |
Merge pull request #5200 from pfaro/bugfix-signup
Add check if the signup setting is enabled. fixes #4832
| -rw-r--r-- | app/views/devise/shared/_links.erb | 2 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 3 |
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 8ece14526b3..0b1560ac587 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 |