luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 20:56:50 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/lib
History
Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
2023-02-25 14:00:40 +01: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
devise
generators
json_ld
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
paperclip Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
rails Autofix Rubocop Style/StringLiterals (#23695) 2023-02-19 07:38:14 +09:00
redis
sanitize_ext Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
simple_navigation
tasks Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
templates
terrapin
webpacker
cli.rb Autofix Rubocop Style/Lambda (#23696) 2023-02-18 12:39:00 +01:00
exceptions.rb Fix error when passing unknown filter param in REST API (#20626) 2022-11-14 08:06:06 +01:00