monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/spec
History
Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
 		2024-10-26 13:38:07 +02:00
..
chewy
…
config/initializers/rack
…
controllers Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 2024-10-19 19:13:32 +02:00
fabrication
…
fabricators Worker specs coverage increase (#32541) 2024-10-23 07:50:20 +00:00
fixtures
…
generators
…
helpers Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02:00
lib Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02:00
locales
…
mailers Add coverage for missing status scenario in NotificationMailer (#32256) 2024-10-04 14:15:14 +00:00
models Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02:00
policies Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 2024-10-19 19:13:32 +02:00
presenters Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 2024-10-06 16:07:58 +02:00
requests Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 2024-10-26 13:38:07 +02:00
routing Support /.well-known/host-meta.json (#32206) 2024-10-02 09:23:44 +00:00
search/models/concerns/account
…
serializers Reduce factory creation (48 -> 8) in `AP::Note` serializer spec (#32492) 2024-10-15 13:10:03 +00:00
services Translate to regional language variant (e.g. pt-BR) (#32428) 2024-10-15 13:26:20 +00:00
support Remove single-use `ProfileStories` method (#31164) 2024-10-23 13:31:03 +00:00
system Remove single-use `ProfileStories` method (#31164) 2024-10-23 13:31:03 +00:00
validators Add ability to manage which websites can credit you in link previews (#31819) 2024-09-10 12:00:40 +00:00
views
…
workers Add endpoint to remove web push subscription (#32626) 2024-10-23 08:02:31 +00:00
flatware_helper.rb
…
rails_helper.rb Improve `app/policies` coverage (#32426) 2024-10-15 14:24:12 +00:00
spec_helper.rb
…