Commit graph

38236 commits

Author SHA1 Message Date
Daniel M Brasil
5a7c6c6597
Migrate to request specs in /api/v1/timelines/public (#25746)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-18 09:15:18 +02:00
forsamori
299515af60 Add MacOS M1/2 setup steps to README (#25682)
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
2023-07-18 09:02:45 +02:00
forsamori
55cf18b689
Add MacOS M1/2 setup steps to README (#25682)
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
2023-07-18 09:02:45 +02:00
Claire
f6cb394544 Merge pull request #2305 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-07-17 21:06:58 +02:00
Claire
1a33f1df17
Merge pull request #2305 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-07-17 21:06:58 +02:00
Claire
87d2e00e66 [Glitch] Fix “Back” button sometimes redirecting out of Mastodon
Port 80fa2baa3d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-17 19:12:09 +02:00
Claire
0c45bed333 [Glitch] Fix “Back” button sometimes redirecting out of Mastodon
Port a442a1d1c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-17 19:12:09 +02:00
Claire
cb70bb8665 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
2023-07-17 19:02:23 +02:00
Claire
c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
2023-07-17 19:02:23 +02:00
Claire
7bf852b3f5 Merge pull request #2302 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-07-17 18:58:40 +02:00
Claire
0e1d2e15a3
Merge pull request #2302 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-07-17 18:58:40 +02:00
Matt Jankowski
4bbb68d888 Fix haml-lint Rubocop Style/SlicingWithRange cop (#25947) 2023-07-17 18:18:13 +02:00
Matt Jankowski
4207c95d4f
Fix haml-lint Rubocop Style/SlicingWithRange cop (#25947) 2023-07-17 18:18:13 +02:00
Claire
80fa2baa3d Fix “Back” button sometimes redirecting out of Mastodon (#25281) 2023-07-17 17:32:46 +02:00
Claire
a442a1d1c6
Fix “Back” button sometimes redirecting out of Mastodon (#25281) 2023-07-17 17:32:46 +02:00
Matt Jankowski
65d52af3e7 Fix haml-lint Rubocop Style/StringLiterals cop (#25948) 2023-07-17 16:57:18 +02:00
Matt Jankowski
d0f00206dc
Fix haml-lint Rubocop Style/StringLiterals cop (#25948) 2023-07-17 16:57:18 +02:00
Daniel M Brasil
381baa978a Migrate to request specs in /api/v1/statuses/:status_id/favourite (#25626) 2023-07-17 16:53:57 +02:00
Daniel M Brasil
19208aa422
Migrate to request specs in /api/v1/statuses/:status_id/favourite (#25626) 2023-07-17 16:53:57 +02:00
Daniel M Brasil
b9694cb13e Migrate to request specs in /api/v1/statuses/:status_id/bookmark (#25624) 2023-07-17 16:51:49 +02:00
Daniel M Brasil
6fb4a756ff
Migrate to request specs in /api/v1/statuses/:status_id/bookmark (#25624) 2023-07-17 16:51:49 +02:00
Daniel M Brasil
31b2765f6e Migrate to request specs in /api/v1/polls (#25596) 2023-07-17 16:50:00 +02:00
Daniel M Brasil
4859958a0c
Migrate to request specs in /api/v1/polls (#25596) 2023-07-17 16:50:00 +02:00
Daniel M Brasil
32b7709183 Migrate to request specs in /api/v1/statuses/:status_id/pin (#25635) 2023-07-17 16:24:05 +02:00
Daniel M Brasil
1aea938d3d
Migrate to request specs in /api/v1/statuses/:status_id/pin (#25635) 2023-07-17 16:24:05 +02:00
Daniel M Brasil
07cb4e35f4 Migrate to request specs in /api/v1/emails/confirmations (#25686) 2023-07-17 16:22:33 +02:00
Daniel M Brasil
6cdc8408a9
Migrate to request specs in /api/v1/emails/confirmations (#25686) 2023-07-17 16:22:33 +02:00
Daniel M Brasil
9c6f214c17 Migrate to request specs in /api/v1/timelines/home (#25743) 2023-07-17 16:20:11 +02:00
Daniel M Brasil
8a1aabaac1
Migrate to request specs in /api/v1/timelines/home (#25743) 2023-07-17 16:20:11 +02:00
Nick Schonning
020101b0a8 Increase PR Rebase job retries (#25926) 2023-07-17 16:10:43 +02:00
Nick Schonning
c80ecf2ff7
Increase PR Rebase job retries (#25926) 2023-07-17 16:10:43 +02:00
Jeong Arm
90a68ac5b5 Check if json body is null on Activitipub::ProcessingWorker (#26021) 2023-07-17 15:51:30 +02:00
Jeong Arm
664b0ca8cb
Check if json body is null on Activitipub::ProcessingWorker (#26021) 2023-07-17 15:51:30 +02:00
Matt Jankowski
a522b40507 Fix haml-lint Rubocop Style/MinMaxComparison cop (#25974) 2023-07-17 15:38:04 +02:00
Matt Jankowski
bd33efdf16
Fix haml-lint Rubocop Style/MinMaxComparison cop (#25974) 2023-07-17 15:38:04 +02:00
Matt Jankowski
af05a88ea8 Fix haml-lint Rubocop lambda cop (#25946) 2023-07-17 15:07:29 +02:00
Matt Jankowski
361dd43235
Fix haml-lint Rubocop lambda cop (#25946) 2023-07-17 15:07:29 +02:00
Matt Jankowski
84c5baf149 Fix haml lint Rubocop Style/RedundantStringCoercion cop (#25975) 2023-07-17 14:08:56 +02:00
Matt Jankowski
5096deb818
Fix haml lint Rubocop Style/RedundantStringCoercion cop (#25975) 2023-07-17 14:08:56 +02:00
renovate[bot]
877ea733b2 Update dependency react-select to v5.7.4 (#26033)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-17 14:07:36 +02:00
renovate[bot]
2a9063e36a
Update dependency react-select to v5.7.4 (#26033)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-17 14:07:36 +02:00
Claire
e8631f8e90 Remove unfollowed hashtag posts from home feed (#26028) 2023-07-17 13:56:28 +02:00
Claire
943f27f437
Remove unfollowed hashtag posts from home feed (#26028) 2023-07-17 13:56:28 +02:00
Claire
2d1ecbe1fe Fix some incorrect tests (#26035) 2023-07-17 13:13:43 +02:00
Claire
f18618d7f9
Fix some incorrect tests (#26035) 2023-07-17 13:13:43 +02:00
Michael Stanclift
df2d18c52a [Glitch] Fix for "follows you" indicator in light web UI not readable
Port 40e20d687a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-17 13:01:47 +02:00
Michael Stanclift
12e7f5fabd [Glitch] Fix for "follows you" indicator in light web UI not readable
Port 97ce47e451 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-17 13:01:47 +02:00
Terence Eden
d2500a89fc [Glitch] Prevent split line between icon and number on reposts & favourites
Port 82b0cfce7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-17 13:01:07 +02:00
Terence Eden
27f7e5b0f3 [Glitch] Prevent split line between icon and number on reposts & favourites
Port b923a4c755 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-17 13:01:07 +02:00
Claire
0ef1efbe71 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 12:52:15 +02:00