Admission-based registrations mode (#10250)

Fix #6856 Fix #6951
2019-03-14 05:28:30 +01:00 · 2019-03-14 05:28:30 +01:00 · 51e154f5e8
commit 51e154f5e8
parent 6e3936aa6f
92 changed files with 282 additions and 249 deletions
--- a/app/services/app_sign_up_service.rb
+++ b/app/services/app_sign_up_service.rb
@ -18,6 +18,6 @@ class AppSignUpService < BaseService
  private

  def allowed_registrations?
-    Setting.open_registrations && !Rails.configuration.x.single_user_mode
+    Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode
  end
 end