diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-10 12:28:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 12:28:13 +0200 |
| commit | 8514ef723c3e3963567a9d57bd0d71a5091fc802 (patch) | |
| tree | dea7d2bc6c079548945495c130d6373218387dda | |
| parent | 210fa3a94e18f95a264a20046602db9c5e838479 (diff) | |
Fix login sometimes redirecting to paths that are not pages (#11019)
Fix #11016
| -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 d820b257e..950cf6d09 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? |