luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-18 04:43:24 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec
History
Claire 8743b1ea40 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/trends/links/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/statuses/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/tags/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
2022-03-02 20:48:27 +01:00
..
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 20:48:27 +01:00
fabricators Fix report category not being saved in REST API (#17682) 2022-03-02 18:57:08 +01:00
features
fixtures Fix some link previews being incorrectly generated from other prior links (#16885) 2021-10-21 20:39:35 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-09 17:28:33 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 18:02:48 +01:00
mailers Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-02-10 19:09:27 +01:00
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 2022-02-23 18:13:12 +01:00
support fix #17601 change :keys to :attribute_names (#17637) 2022-02-24 14:46:21 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-10-13 15:50:24 +02:00
workers Improve tests involving push_bulk (#17508) 2022-02-10 19:42:45 +01:00
rails_helper.rb Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00
spec_helper.rb Improve tests involving push_bulk (#17508) 2022-02-10 19:42:45 +01:00