diff options
| author | Reverite <github@reverite.sh> | 2019-07-31 01:41:31 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-31 01:41:31 -0700 |
| commit | 7a312a38f904e853f5703a0b678d0aec83fa858c (patch) | |
| tree | eba4b787f6a617e1c2c5f7d4b5be66320212be1d /app/controllers/application_controller.rb | |
| parent | 3013c6cb78358ed8a95a35d5db79608fcb06963f (diff) | |
| parent | 4ecfa8f298399d9857737f212fc8f5767ffa7c6d (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4a6b96982..19efc8838 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -11,6 +11,7 @@ class ApplicationController < ActionController::Base include UserTrackingConcern include SessionTrackingConcern include CacheConcern + include DomainControlHelper helper_method :current_account helper_method :current_session @@ -18,6 +19,7 @@ class ApplicationController < ActionController::Base helper_method :current_skin helper_method :single_user_mode? helper_method :use_seamless_external_login? + helper_method :whitelist_mode? rescue_from ActionController::RoutingError, with: :not_found rescue_from ActiveRecord::RecordNotFound, with: :not_found @@ -39,7 +41,7 @@ class ApplicationController < ActionController::Base end def authorized_fetch_mode? - ENV['AUTHORIZED_FETCH'] == 'true' + ENV['AUTHORIZED_FETCH'] == 'true' || Rails.configuration.x.whitelist_mode end def public_fetch_mode? |