diff options
author | ThibG <thib@sitedethib.com> | 2019-03-14 22:11:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-14 22:11:56 +0100 |
commit | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (patch) | |
tree | 74a5e58f2c724746d2e929b9df0e5682f17a2637 /app/controllers/auth/registrations_controller.rb | |
parent | fa75324059c7a146354470691888dc0e1de0342f (diff) | |
parent | 09ac5e7528ba3bfe90c20002f47c863d9afc6fcd (diff) |
Merge pull request #960 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/auth/registrations_controller.rb')
-rw-r--r-- | app/controllers/auth/registrations_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index efe29b53f..74dd7ff34 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -66,7 +66,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController end def allowed_registrations? - Setting.open_registrations || @invite&.valid_for_use? + Setting.registrations_mode != 'none' || @invite&.valid_for_use? end def invite_code |