nyastodon/app
Jeremy Kescher 0e634397c3
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	.github/workflows/build-image.yml
#	Gemfile.lock
2023-02-21 00:40:08 +01:00
..
chewy Revert reverting "Change algorithm of tootctl search deploy to improve performance (#18463)". 2022-05-26 20:58:16 +02:00
controllers Merge remote-tracking branch 'upstream/main' into develop 2023-02-21 00:40:08 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
javascript Merge remote-tracking branch 'upstream/main' into develop 2023-02-21 00:40:08 +01:00
lib Merge remote-tracking branch 'upstream/main' into develop 2023-02-21 00:40:08 +01:00
mailers Add single splat to callback method definitions to avoid ArgumentError (#22246) 2022-12-13 20:03:16 +01:00
models Merge remote-tracking branch 'upstream/main' into develop 2023-02-21 00:40:08 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
presenters Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
serializers Merge remote-tracking branch 'upstream/main' into develop 2023-02-21 00:40:08 +01:00
services Merge remote-tracking branch 'upstream/main' into develop 2023-02-21 00:40:08 +01:00
validators Merge remote-tracking branch 'upstream/main' into develop 2023-02-21 00:40:08 +01:00
views Merge remote-tracking branch 'upstream/main' into develop 2023-02-21 00:40:08 +01:00
workers Merge remote-tracking branch 'upstream/main' into develop 2023-02-21 00:40:08 +01:00