luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-15 09:56:47 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec
History
Claire 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/admin/dashboard_controller.rb`:
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram.
- `app/views/admin/dashboard/index.html.haml`
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram.
2021-10-14 21:44:57 +02:00
..
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-10-13 15:50:24 +02:00
fabricators Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
features
fixtures Switch from unmaintained paperclip to kt-paperclip (#16724) 2021-09-29 23:52:36 +02:00
helpers
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-09-26 18:28: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-10-13 15:50:24 +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-10-14 21:44:57 +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-10-13 15:50:24 +02:00
workers Fix followers synchronization mechanism not working when URI has empty path (#16510) 2021-08-11 17:48:42 +02:00
rails_helper.rb
spec_helper.rb