]> cat aescling's git repositories - mastodon.git/commitdiff
Fix login sometimes redirecting to paths that are not pages (#11019)
authorEugen Rochko <eugen@zeonfederated.com>
Mon, 10 Jun 2019 10:28:13 +0000 (12:28 +0200)
committerGitHub <noreply@github.com>
Mon, 10 Jun 2019 10:28:13 +0000 (12:28 +0200)
Fix #11016

app/controllers/custom_css_controller.rb
app/controllers/manifests_controller.rb
app/controllers/media_controller.rb
app/controllers/media_proxy_controller.rb

index be768c08948ed9b72fd5c5e8dfde8988df642199..6e80feaf837fac3c21d8ef8fd2c0b6f31d0c5b12 100644 (file)
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class CustomCssController < ApplicationController
+  skip_before_action :store_current_location
+
   before_action :set_cache_headers
 
   def show
index ac267c229459b24ad94ffcf579a9e23ec1f2fa23..332d845d8252c831a08bdde32fc100829d6d93cd 100644 (file)
@@ -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
index 8e1624ce1b449b627f227df85a616c8f021dbb81..a245db2d1c9f070aa65be55cda29ef5ddd11c01d 100644 (file)
@@ -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!
 
index d820b257e0ac65605776c7dc7f3f3a30b50db9af..950cf6d09f2673ff132f092a31f681a997aa1ec9 100644 (file)
@@ -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?