luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-05 22:45:37 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/lib
History
Claire 9ae60f8738 Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.
2023-07-12 16:03:05 +02:00
..
action_controller
active_record Fix Style/SlicingWithRange cop (#25923) 2023-07-12 10:03:06 +02:00
assets
chewy/strategy
devise
generators/post_deployment_migration
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 '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
paperclip Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
rails Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
redis
sanitize_ext Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
simple_navigation
tasks Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream 2023-07-12 16:03:05 +02:00
templates/haml/scaffold
terrapin
webpacker
exceptions.rb
public_file_server_middleware.rb Add hardened headers to user-uploaded files (#25756) 2023-07-06 14:31:37 +02:00