mastodon/lib
Claire 178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
2023-06-25 14:27:38 +02:00
..
action_controller Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
active_record Apply Rubocop Performance/BindCall (#23437) 2023-02-08 09:10:25 +09:00
assets Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
chewy/strategy Change root Chewy strategy to emit a warning instead of erroring out in production mode (#24327) 2023-04-03 15:05:39 +02:00
devise
generators/post_deployment_migration Clean up the post deployment migration generator (#24233) 2023-04-11 11:25:29 +02:00
json_ld
linter Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
mastodon Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream 2023-06-18 10:36:14 +02:00
paperclip Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
rails Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
redis
sanitize_ext Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
simple_navigation
tasks Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
templates/haml/scaffold Clean up the post deployment migration generator (#24233) 2023-04-11 11:25:29 +02:00
terrapin Autofix Rubocop Style/HashSyntax (#23754) 2023-05-04 05:54:26 +02:00
webpacker
exceptions.rb
public_file_server_middleware.rb Add cache headers to static files served through Rails (#24120) 2023-03-16 02:55:54 +01:00