luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 05:08:03 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec
History
Claire 8ec4be4233 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream-updated dependency (redis) textually too
  close to glitch-soc-only dependecy.
  Updated redis gem like upstream did.
2021-08-09 23:25:49 +02:00
..
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +02:00
fabricators Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
features
fixtures Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
mailers Add Ruby 3.0 support (#16046) 2021-05-06 14:22:54 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +02:00
policies
presenters Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
requests Further preparation for Rails 6 (#15916) 2021-03-19 02:45:34 +01:00
routing
serializers/activitypub
services Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +02:00
support
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-04-20 12:17:14 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-07-13 17:57:15 +02:00
workers Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
rails_helper.rb
spec_helper.rb