diff options
author | Marcin Cieślak <saper@saper.info> | 2017-04-15 16:46:27 +0200 |
---|---|---|
committer | Eugen <eugen@zeonfederated.com> | 2017-04-15 16:46:27 +0200 |
commit | 1c8477eab214629d26d9526b386bf75729917060 (patch) | |
tree | a937c60129fa9ee947c3af7b136a903bd4555c76 /app/controllers/application_controller.rb | |
parent | 6670e6d33fa735b6199e3b962f62ed6d1442bae1 (diff) |
Give SINGLE_USER a chance to register (#1820)
An attempt to open a brand new Mastodon instance configured as SINGLE_USER_MODE=true will cause an exception. Enable temporary registration if we have no users in the database Fixes #1817
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r-- | app/controllers/application_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 61ca71123..0c320177d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -8,7 +8,7 @@ class ApplicationController < ActionController::Base force_ssl if: "Rails.env.production? && ENV['LOCAL_HTTPS'] == 'true'" include Localized - helper_method :current_account + helper_method :current_account, :single_user_mode? rescue_from ActionController::RoutingError, with: :not_found rescue_from ActiveRecord::RecordNotFound, with: :not_found @@ -69,6 +69,10 @@ class ApplicationController < ActionController::Base end end + def single_user_mode? + @single_user_mode ||= Rails.configuration.x.single_user_mode && Account.first + end + def current_account @current_account ||= current_user.try(:account) end |