Commit 9ffabc6d7ed0c71d133a29671b50795fb621522c
Exists in
master
and in
4 other branches
Merge pull request #5200 from pfaro/bugfix-signup
Add check if the signup setting is enabled. fixes #4832
Showing
2 changed files
with
3 additions
and
2 deletions
Show diff stats
app/views/devise/shared/_links.erb
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | <%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br /> |
| 3 | 3 | <% end -%> |
| 4 | 4 | |
| 5 | -<%- if devise_mapping.registerable? && controller_name != 'registrations' %> | |
| 5 | +<%- if devise_mapping.registerable? && controller_name != 'registrations' && Gitlab.config.gitlab.signup_enabled %> | |
| 6 | 6 | <%= link_to "Sign up", new_registration_path(resource_name) %><br /> |
| 7 | 7 | <% end -%> |
| 8 | 8 | ... | ... |
config/gitlab.yml.example
| ... | ... | @@ -52,7 +52,8 @@ production: &base |
| 52 | 52 | |
| 53 | 53 | |
| 54 | 54 | ## Users management |
| 55 | - # signup_enabled: true # default: false - Account passwords are not sent via the email if signup is enabled. | |
| 55 | + # default: false - Account passwords are not sent via the email if signup is enabled. | |
| 56 | + # signup_enabled: true | |
| 56 | 57 | |
| 57 | 58 | ## Automatic issue closing |
| 58 | 59 | # If a commit message matches this regular express, all issues referenced from the matched text will be closed | ... | ... |