diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-22 15:39:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 15:39:36 +0200 |
| commit | 4024952b58bacb94d2cb43fafddf0e97bea4c55c (patch) | |
| tree | b1c1e5cdb84606879d65ecceebe4cf665332379b /app/controllers/application_controller.rb | |
| parent | 801e546ecc1efb4103232d8265229eb455a8dd5b (diff) | |
| parent | f8e315cd74d05a6878bbd018b20462daa0b5e660 (diff) | |
Merge pull request #1385 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 63d9f91fb..e996c2217 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -56,7 +56,7 @@ class ApplicationController < ActionController::Base end def store_current_location - store_location_for(:user, request.url) unless request.format == :json + store_location_for(:user, request.url) unless [:json, :rss].include?(request.format&.to_sym) end def require_admin! |