rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Glitch-Shrike/app/javascript/mastodon/features
History
Claire aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream updated `docker/build-push-action`, and we a different config
  for `docker/metadata-action` so the lines directly above were different,
  but it's not a real conflict.
  Upgraded `docker/build-push-action` as upstream did.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Upstream changed the codestyle near a line we had modified to accommodate
  configurable character count.
  Kept our change.
 		2023-02-03 19:23:27 +01:00
..
about Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
account Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
account_gallery Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
account_timeline Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
audio Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
blocks
…
bookmarked_statuses Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
closed_registrations_modal
…
community_timeline Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
compose Merge branch 'main' into glitch-soc/merge-upstream 2023-02-03 19:23:27 +01:00
direct_timeline Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
directory Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
domain_blocks
…
emoji Update hasOwnProperty calls for ESLint (#23307) 2023-01-30 03:07:51 +01:00
explore Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
favourited_statuses Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
favourites Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
filters Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
follow_recommendations Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
follow_requests
…
followed_tags Separate ESLint CI from Superlinter (#23029) 2023-01-29 23:44:03 +01:00
followers
…
following
…
generic_not_found
…
getting_started Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
hashtag_timeline Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
home_timeline Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
interaction_modal Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
keyboard_shortcuts
…
list_adder
…
list_editor Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
list_timeline Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
lists Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
mutes
…
notifications Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
picture_in_picture Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
pinned_statuses Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
privacy_policy
…
public_timeline Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
reblogs Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
report Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
standalone/compose autofocus the compose form again on /share (#23094) 2023-01-30 14:49:10 +01:00
status Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
subscribed_languages_modal Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
ui Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
video Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00