diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-08 11:36:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-08 11:36:43 +0200 |
| commit | c141f0a886c03ff1edf99e36c6d50c4bbdf10418 (patch) | |
| tree | fd6217860790e46f532cc99802353cc33120d2b8 /app/controllers/application_controller.rb | |
| parent | 55d03da303dcc2d0cdf0d642534d0f6337e252c9 (diff) | |
| parent | 40703b96fa6ccc2b53a266ab67bbb61ce4b64160 (diff) | |
Merge pull request #1216 from tootsuite/fix-default-locale-regression
Fix #1165 - Default locale no longer breaks form submissions
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f00f9c1e3..61ca71123 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,14 +1,13 @@ # 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 force_ssl if: "Rails.env.production? && ENV['LOCAL_HTTPS'] == 'true'" + include Localized helper_method :current_account rescue_from ActionController::RoutingError, with: :not_found @@ -41,7 +40,6 @@ class ApplicationController < ActionController::Base # If the sign in is after a two week break, we need to regenerate their feed RegenerationWorker.perform_async(current_user.account_id) if current_user.last_sign_in_at < 14.days.ago - return end def check_suspension |