UnionRoom
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
mastodon/app/views
History
Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/custom_emoji.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific validation.
  Applied upstream changes.
- `app/models/public_feed.rb`:
  Not a real conflict, just upstream changing a line too close to
  a glitch-soc-specific parameter documentation.
  Applied upstream changes.
 		2022-11-10 09:36:47 +01:00
..
about Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
accounts Fix being able to spoof link verification (#20217) 2022-11-09 08:24:21 +01:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:49:42 +02:00
admin_mailer
…
application Add image processing and generate blurhash for server thumbnail (#19348) 2022-10-13 11:29:19 +02:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2022-11-08 15:44:57 +01:00
authorize_interactions Fix links to the Web UI in notifications (#19981) 2022-11-07 15:42:58 +01:00
custom_css
…
disputes/strikes Add null check on application in dispute viewer (#19851) 2022-11-07 03:40:17 +01:00
errors
…
filters
…
follower_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
following_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
home Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
invites
…
kaminari
…
layouts Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
media
…
notification_mailer Fix links to the Web UI in notifications (#19981) 2022-11-07 15:42:58 +01:00
oauth
…
privacy Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
relationships
…
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-11-08 15:44:57 +01:00
shared Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
shares
…
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-11-07 19:53:30 +01:00
statuses_cleanup
…
tags Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
user_mailer
…
well_known/host_meta
…