3fef4a8561
Merge pull request #2309 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-19 08:18:05 +02:00
d315c684e4
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream entirely refactored this, while we changed the docker repository
to upload to and disabled the “latest” tag.
Applied the repository change to `.github/workflows/build-*.yml`, as well
as disabling native ARMv64 builds.
- `README.md`:
We have a completely different README.
Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
Upstream refactored, we had an extra item.
Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
Upstream deleted this file, to be replaced by a request spec at
`spec/requests/api/v1/timelines/public_spec.rb`.
We had an extra bit about enabling the public timelines because we have
different defaults than upstream.
Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
2023-07-19 07:35:51 +02:00
4c50463116
New Crowdin updates ( #2306 )
...
* New translations en.json (French)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (French, Quebec)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
2023-07-19 07:05:33 +02:00
33a41a214a
New Crowdin Translations (automated) ( #26054 )
...
Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-18 21:13:25 +02:00
e77bbcc463
Change request timeout handling to use a longer deadline ( #26055 )
2023-07-18 20:51:20 +02:00
630744563f
Fix haml-lint `InstanceVariables` rule for auth/registrations/edit ( #26061 )
2023-07-18 18:10:52 +02:00
d2e79d0df9
Fix haml-lint Rubocop `Style/SymbolProc` cop ( #26059 )
2023-07-18 17:43:04 +02:00
fb30fb4d89
Fix haml-lint Rubocop `Style/WordArray` cop ( #26058 )
2023-07-18 17:25:41 +02:00
359255c799
Fix haml-lint rubocop style negation cops ( #26057 )
2023-07-18 17:02:02 +02:00
441db971d9
Fixes to the new Image build actions ( #26056 )
2023-07-18 16:56:42 +02:00
4316506b91
Add a Github Action to send translations to Crowdin for each merge in main ( #25869 )
2023-07-18 16:56:01 +02:00
f5c0e7be04
Rework the container image build actions ( #26007 )
2023-07-18 13:36:12 +02:00
c05ff864cc
Migrate to request specs in `/api/v1/mutes` ( #25622 )
2023-07-18 13:05:19 +02:00
b9c408b344
Fix haml-lint `ConsecutiveSilentScripts` rule ( #26043 )
2023-07-18 09:25:37 +02:00
97a627d669
Update dependency ox to v2.14.17 ( #26044 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-18 09:24:48 +02:00
03eaa9746c
Migrate to request specs in `/api/v1/bookmarks` ( #25520 )
2023-07-18 09:15:50 +02:00
580d5831ec
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
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
f6cb394544
Merge pull request #2305 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-17 21:06:58 +02:00
87d2e00e66
[Glitch] Fix “Back” button sometimes redirecting out of Mastodon
...
Port 80fa2baa3d
2023-07-17 19:12:09 +02:00
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
7bf852b3f5
Merge pull request #2302 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-17 18:58:40 +02:00
4bbb68d888
Fix haml-lint Rubocop `Style/SlicingWithRange` cop ( #25947 )
2023-07-17 18:18:13 +02:00
80fa2baa3d
Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )
2023-07-17 17:32:46 +02:00
65d52af3e7
Fix haml-lint Rubocop `Style/StringLiterals` cop ( #25948 )
2023-07-17 16:57:18 +02:00
381baa978a
Migrate to request specs in `/api/v1/statuses/:status_id/favourite` ( #25626 )
2023-07-17 16:53:57 +02:00
b9694cb13e
Migrate to request specs in `/api/v1/statuses/:status_id/bookmark` ( #25624 )
2023-07-17 16:51:49 +02:00
31b2765f6e
Migrate to request specs in `/api/v1/polls` ( #25596 )
2023-07-17 16:50:00 +02:00
32b7709183
Migrate to request specs in `/api/v1/statuses/:status_id/pin` ( #25635 )
2023-07-17 16:24:05 +02:00
07cb4e35f4
Migrate to request specs in `/api/v1/emails/confirmations` ( #25686 )
2023-07-17 16:22:33 +02:00
9c6f214c17
Migrate to request specs in `/api/v1/timelines/home` ( #25743 )
2023-07-17 16:20:11 +02:00
020101b0a8
Increase PR Rebase job retries ( #25926 )
2023-07-17 16:10:43 +02:00
90a68ac5b5
Check if json body is null on Activitipub::ProcessingWorker ( #26021 )
2023-07-17 15:51:30 +02:00
a522b40507
Fix haml-lint Rubocop `Style/MinMaxComparison` cop ( #25974 )
2023-07-17 15:38:04 +02:00
af05a88ea8
Fix haml-lint Rubocop `lambda` cop ( #25946 )
2023-07-17 15:07:29 +02:00
84c5baf149
Fix haml lint Rubocop `Style/RedundantStringCoercion` cop ( #25975 )
2023-07-17 14:08:56 +02:00
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
e8631f8e90
Remove unfollowed hashtag posts from home feed ( #26028 )
2023-07-17 13:56:28 +02:00
2d1ecbe1fe
Fix some incorrect tests ( #26035 )
2023-07-17 13:13:43 +02:00
df2d18c52a
[Glitch] Fix for "follows you" indicator in light web UI not readable
...
Port 40e20d687a
2023-07-17 13:01:47 +02:00
d2500a89fc
[Glitch] Prevent split line between icon and number on reposts & favourites
...
Port 82b0cfce7e
2023-07-17 13:01:07 +02:00
0ef1efbe71
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-17 12:52:15 +02:00
d35725d9b5
Update dependency public_suffix to v5.0.3 ( #26032 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-17 12:40:54 +02:00
6d256a116c
Update rubocop 1.54.2 ( #26002 )
2023-07-17 12:40:27 +02:00
fb18574f9c
Update dependency aws-sdk-s3 to v1.130.0 ( #25967 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-17 12:39:50 +02:00
94a411d276
remove some file paths from rubocop_tobo.yml ( #26022 )
2023-07-17 12:15:32 +02:00
42f670c82d
Update dependency postcss to v8.4.26 ( #26030 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-17 12:13:01 +02:00
a75c14ffc0
Fix ArgumentError in mailers when a user's timezone is blank ( #26025 )
2023-07-17 12:10:50 +02:00
40e20d687a
Fix for "follows you" indicator in light web UI not readable ( #25993 )
2023-07-17 11:51:00 +02:00
20537e068f
Update dependency immutable to v4.3.1 ( #26029 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-17 11:39:35 +02:00
Claire