Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
2019-03-14 17:14:05 +01:00
parent fa75324059 874bd3ac0c
commit 07eb31eeac
103 changed files with 523 additions and 434 deletions
--- 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