Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 08:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `tsconfig.json`:
  glitch-soc had extra paths under `app/javascript/flavours`, but upstream
  added `app/javascript` as a whole, so updated to upstream's.
This commit is contained in:
Claire
2025-06-25 19:29:09 +02:00
parent fa9318083e dbb20f76a7
commit c9a1e27a49
91 changed files with 1108 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/stoplight/redis_data_store_extensions.rb
View File

@@ -1,17 +0,0 @@
# frozen_string_literal: true
# Restore compatibility with Redis < 6.2
module Stoplight
module DataStore
module RedisExtensions
def query_failures(light, transaction: @redis)
window_start = Time.now.to_i - light.window_size
transaction.zrevrangebyscore(failures_key(light), Float::INFINITY, window_start)
end
end
end
end
Stoplight::DataStore::Redis.prepend(Stoplight::DataStore::RedisExtensions)

2
lib/vite_ruby/sri_extensions.rb
View File

@@ -9,7 +9,7 @@ module ViteRuby::ManifestIntegrityExtension
def load_manifest
# Invalidate the name lookup cache when reloading manifest
@name_lookup_cache = load_name_lookup_cache unless dev_server_running?
@name_lookup_cache = nil unless dev_server_running?
super
end