diff options
| author | Effy Elden <github@effy.is> | 2017-04-17 01:41:33 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 01:41:33 +1000 |
| commit | acd33101c50ba0cf09c1c41616f919d37760f3f7 (patch) | |
| tree | 43564c181a7f58ce7471026bd0daa099344330e8 /app/controllers/application_controller.rb | |
| parent | fd81916e8625e5de39855522300eaeffd85ee13d (diff) | |
| parent | 99226aba9391535a20d3cc6dba0f45e5792c73d4 (diff) | |
Merge branch 'master' into fix/cache_blocking
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 0c320177d..e8d7de218 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -8,7 +8,9 @@ class ApplicationController < ActionController::Base force_ssl if: "Rails.env.production? && ENV['LOCAL_HTTPS'] == 'true'" include Localized - helper_method :current_account, :single_user_mode? + + helper_method :current_account + helper_method :single_user_mode? rescue_from ActionController::RoutingError, with: :not_found rescue_from ActiveRecord::RecordNotFound, with: :not_found |