fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-18 12:30:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix login sometimes redirecting to paths that are not pages (#11019)

Browse source 
Fix #11016
This commit is contained in:
Eugen Rochko 2019-06-10 12:28:13 +02:00 committed by GitHub
parent 210fa3a94e
commit 8514ef723c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/custom_css_controller.rb
View file

@ -1,6 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
class CustomCssController < ApplicationController class CustomCssController < ApplicationController
skip_before_action :store_current_location
before_action :set_cache_headers before_action :set_cache_headers
def show def show

2
app/controllers/manifests_controller.rb
View file

@ -1,6 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
class ManifestsController < ApplicationController class ManifestsController < ApplicationController
skip_before_action :store_current_location
def show def show
render json: InstancePresenter.new, serializer: ManifestSerializer render json: InstancePresenter.new, serializer: ManifestSerializer
end end

2
app/controllers/media_controller.rb
View file

@ -3,6 +3,8 @@
class MediaController < ApplicationController class MediaController < ApplicationController
include Authorization include Authorization
skip_before_action :store_current_location
before_action :set_media_attachment before_action :set_media_attachment
before_action :verify_permitted_status! before_action :verify_permitted_status!

2
app/controllers/media_proxy_controller.rb
View file

@ -3,6 +3,8 @@
class MediaProxyController < ApplicationController class MediaProxyController < ApplicationController
include RoutingHelper include RoutingHelper
skip_before_action :store_current_location
def show def show
RedisLock.acquire(lock_options) do |lock| RedisLock.acquire(lock_options) do |lock|
if lock.acquired? if lock.acquired?