Commit 9920ede2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'enable-signup' into 'master'

Enable signup by default

See merge request !1394
parents 01ab0812 3c5c1a78
...@@ -23,6 +23,7 @@ v 7.7.0 ...@@ -23,6 +23,7 @@ v 7.7.0
- Close standard input in Gitlab::Popen.popen - Close standard input in Gitlab::Popen.popen
- Trigger GitLab CI when push tags - Trigger GitLab CI when push tags
- When accept merge request - do merge using sidaekiq job - When accept merge request - do merge using sidaekiq job
- Enable web signups by default
v 7.6.0 v 7.6.0
......
...@@ -105,7 +105,7 @@ rescue ArgumentError # no user configured ...@@ -105,7 +105,7 @@ rescue ArgumentError # no user configured
'/home/' + Settings.gitlab['user'] '/home/' + Settings.gitlab['user']
end end
Settings.gitlab['time_zone'] ||= nil Settings.gitlab['time_zone'] ||= nil
Settings.gitlab['signup_enabled'] ||= false Settings.gitlab['signup_enabled'] ||= true
Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil? Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], []) Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil? Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment