Merge branch 'main' into glitch-soc/merge-upstream

2022-03-12 11:51:25 +01:00
parent 2c8bb17453 d3aa9cf774
commit bb9a6fb5c2
308 changed files with 4127 additions and 2772 deletions
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@ -118,9 +118,9 @@ class Rack::Attack
    req.session[:attempt_user_id] || req.params.dig('user', 'email').presence if req.post? && req.path == '/auth/sign_in'
  end

-  self.throttled_response = lambda do |env|
+  self.throttled_responder = lambda do |request|
    now        = Time.now.utc
-    match_data = env['rack.attack.match_data']
+    match_data = request.env['rack.attack.match_data']

    headers = {
      'Content-Type'          => 'application/json',