Download as
Browse Code »

Commit 9ffabc6d7ed0c71d133a29671b50795fb621522c

Authored by Dmitriy Zaporozhets
2 parents 715eaed6 96ae1a80
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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
  Diff comments   View file @9ffabc6
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br /> 2 <%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br />
3 <% end -%> 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 <%= link_to "Sign up", new_registration_path(resource_name) %><br /> 6 <%= link_to "Sign up", new_registration_path(resource_name) %><br />
7 <% end -%> 7 <% end -%>
8 8
config/gitlab.yml.example
  Diff comments   View file @9ffabc6
@@ -52,7 +52,8 @@ production: &amp;base @@ -52,7 +52,8 @@ production: &amp;base
52 52
53 53
54 ## Users management 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 ## Automatic issue closing 58 ## Automatic issue closing
58 # If a commit message matches this regular express, all issues referenced from the matched text will be closed 59 # If a commit message matches this regular express, all issues referenced from the matched text will be closed