diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-10 12:28:13 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-11-19 16:43:38 -0600 |
| commit | 584a63134a1f9d24d1259996e28114c8593f83a3 (patch) | |
| tree | 46d578b2d0ca60707172de33d88a72b38f28da15 /app/controllers | |
| parent | 2b7b9f6ddb0e68bb4a148b30868397b15cbe19e4 (diff) | |
Fix login sometimes redirecting to paths that are not pages (#11019)
Fix #11016
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/custom_css_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/manifests_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/media_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/media_proxy_controller.rb | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/app/controllers/custom_css_controller.rb b/app/controllers/custom_css_controller.rb index be768c089..6e80feaf8 100644 --- a/app/controllers/custom_css_controller.rb +++ b/app/controllers/custom_css_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class CustomCssController < ApplicationController + skip_before_action :store_current_location + before_action :set_cache_headers def show diff --git a/app/controllers/manifests_controller.rb b/app/controllers/manifests_controller.rb index ac267c229..332d845d8 100644 --- a/app/controllers/manifests_controller.rb +++ b/app/controllers/manifests_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class ManifestsController < ApplicationController + skip_before_action :store_current_location + def show render json: InstancePresenter.new, serializer: ManifestSerializer end diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb index 8e1624ce1..a245db2d1 100644 --- a/app/controllers/media_controller.rb +++ b/app/controllers/media_controller.rb @@ -3,6 +3,8 @@ class MediaController < ApplicationController include Authorization + skip_before_action :store_current_location + before_action :set_media_attachment before_action :verify_permitted_status! diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb index c46fc2124..a18979fd0 100644 --- a/app/controllers/media_proxy_controller.rb +++ b/app/controllers/media_proxy_controller.rb @@ -3,6 +3,8 @@ class MediaProxyController < ApplicationController include RoutingHelper + skip_before_action :store_current_location + def show RedisLock.acquire(lock_options) do |lock| if lock.acquired? |