diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:33:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:33:40 -0400 |
commit | d7d165db5b1b7b1959a36e1f0e3da875befc2574 (patch) | |
tree | 5be0ded23cf8a3190a3173bd5b16f4c4af77207f /app/controllers/application_controller.rb | |
parent | 73b8e67f4b103fc3400064d153807d6d88f758d4 (diff) | |
parent | d7f4300ee3ff44a42453ea8042034d651a9789da (diff) |
Merge branch 'master' into add-infinimatix.net-instance
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r-- | app/controllers/application_controller.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c06142fd4..f00f9c1e3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class ApplicationController < ActionController::Base + include Localized + # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception @@ -14,7 +16,6 @@ class ApplicationController < ActionController::Base rescue_from ActionController::InvalidAuthenticityToken, with: :unprocessable_entity before_action :store_current_location, except: :raise_not_found, unless: :devise_controller? - before_action :set_locale before_action :set_user_activity before_action :check_suspension, if: :user_signed_in? @@ -28,12 +29,6 @@ class ApplicationController < ActionController::Base store_location_for(:user, request.url) end - def set_locale - I18n.locale = current_user.try(:locale) || I18n.default_locale - rescue I18n::InvalidLocale - I18n.locale = I18n.default_locale - end - def require_admin! redirect_to root_path unless current_user&.admin? end |