702d162998
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
2023-10-08 16:48:19 +02:00
d7fcd70023
Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/cors.rb`:
Upstream refactored this file, and glitch-soc had local changes.
I could not find the rationale for the glitch-soc changes, so I
used upstream's version.
2023-10-08 16:41:56 +02:00
cfc0da77ac
[Glitch] Fix retention dashboard not displaying correct month
...
Port 7fddeca190
2023-10-08 16:33:37 +02:00
19ebf7797e
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
2023-10-08 16:30:00 +02:00
5393be7a21
Update eslint (non-major) to v6.7.3 ( #27213 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-29 15:51:27 +02:00
48ef7d0f06
Update libretranslate/libretranslate Docker tag to v1.3.12 ( #27214 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-29 15:34:55 +02:00
9b785877d2
Update DefinitelyTyped types (non-major) ( #27212 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-29 15:34:32 +02:00
695e42de0d
New Crowdin Translations (automated) ( #27202 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-29 10:04:18 +02:00
665093a7b6
Update dependency postcss to v8.4.31 ( #27199 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-29 09:50:33 +02:00
a1becc9189
Update dependency node to 20.8 ( #27201 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-29 09:50:15 +02:00
340f1a68be
Simplify instance presenter view access ( #26046 )
2023-09-28 16:52:37 +02:00
2016c5d912
Fix deprecation warning about `rewhere: true` being default behavior (Rails 7.1 prep) ( #27190 )
2023-09-28 16:52:23 +02:00
99e289f03f
Fix include `Rails.application.routes.url_helpers` (Rails 7.1 prep) ( #27189 )
2023-09-28 16:52:11 +02:00
89a17878ef
Fix haml-lint `InstanceVariables` rule for admin/roles/_form ( #26063 )
2023-09-28 16:36:24 +02:00
f9eefb2785
Update dependency rubocop to v1.56.4 ( #27188 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-28 16:25:14 +02:00
9d56c1949b
Fix haml-lint `InstanceVariables` rule for admin/webhooks/_form ( #26062 )
2023-09-28 16:23:35 +02:00
3060bfa4bd
Extract filename and csv helper methods from `Form::Import` ( #26129 )
2023-09-28 16:22:05 +02:00
937dc42f10
Extract methods for file movement in `CLI::Upgrade` ( #25120 )
2023-09-28 16:04:05 +02:00
56c0babc0b
Fix rubocop `Layout/ArgumentAlignment` cop ( #26060 )
2023-09-28 15:48:47 +02:00
e6b903b21e
Fix haml-lint `InstanceVariables` rule for invites/_form ( #26064 )
2023-09-28 15:40:28 +02:00
1da3c588ca
Fix link handling of mentions in user profiles when logged out ( #27185 )
2023-09-28 15:29:07 +02:00
686406cc2d
Fix filtering audit log for entries about disabling 2FA ( #27186 )
2023-09-28 13:41:24 +02:00
f0c720cfc9
Bump version to v4.3.0-alpha.0 ( #27022 )
2023-09-28 13:40:43 +02:00
b93ce7d8b3
New Crowdin Translations (automated) ( #27168 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-28 10:44:16 +02:00
6d0767558a
Make notification respect reduce-motion ( #27178 )
2023-09-28 10:39:38 +02:00
66a7bc215c
Update dependency glob to v10.3.10 ( #27169 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-28 10:30:19 +02:00
0f588a4a86
Update dependency axios to v1.5.1 ( #27159 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-28 10:17:08 +02:00
7fddeca190
Fix retention dashboard not displaying correct month ( #27180 )
2023-09-28 10:16:15 +02:00
2979a5924b
Update dependency @material-design-icons/svg to v0.14.13 ( #27181 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-28 10:14:43 +02:00
ce79caca4e
Only strip country code when language not listed in SUPPORTED_LOCALES ( #27099 )
2023-09-28 10:13:44 +02:00
ebd2017524
fix Content-Security-Policy when using Azure storage ( #2427 )
2023-09-26 20:09:56 +02:00
fde89a8fc0
Merge pull request #2426 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 57f592fed5
2023-09-26 19:03:36 +02:00
1eeaa0d84f
[Glitch] Fix width of large text icon buttons
...
Port 38753acaa5
2023-09-26 13:25:01 +02:00
ca7d16912e
[Glitch] Fix line wrapping of language selection button with long locale codes
...
Port 88fa8e710a
2023-09-26 13:24:29 +02:00
02e6d9f8f9
[Glitch] Fix explore prompt sometimes showing up when the home TL is loading
...
Port a001ae2f39
2023-09-26 13:20:18 +02:00
919ed0e469
[Glitch] Convert `dropdown_menu` state to Typescript
...
Port 4b7bc1f07c
2023-09-26 13:19:27 +02:00
b2d67fbe33
[Glitch] Improve modals reducer types
...
Port b93ffb74bb
2023-09-26 13:17:08 +02:00
abdb58840a
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
2023-09-26 13:13:27 +02:00
57f592fed5
Add Typescript types for some API objects ( #26602 )
2023-09-26 11:25:01 +02:00
2054ee7cd5
Update dependency glob to v10.3.9 ( #27148 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-26 11:12:21 +02:00
82eaa26d87
Update `tootctl maintenance fix-duplicates` to Mastodon v4.2.0 ( #27147 )
2023-09-26 11:11:52 +02:00
fdc9f971f7
Update dependency selenium-webdriver to v4.13.1 ( #27141 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-26 10:47:34 +02:00
5ea3e8e765
New Crowdin Translations (automated) ( #27144 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-26 10:47:16 +02:00
33a066a952
Update dependency glob to v10.3.8 ( #27145 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-26 10:47:04 +02:00
bd810391d6
Properly remove tIME chunk from PNG uploads ( #27111 )
2023-09-25 19:21:07 +02:00
530f48610d
Update docker/setup-qemu-action action to v3 ( #27124 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 18:41:20 +02:00
cdd8c4eb2a
Update docker/setup-buildx-action action to v3 ( #27123 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 18:40:41 +02:00
8ea98aa384
Update docker/metadata-action action to v5 ( #27122 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 18:40:03 +02:00
19bc73b736
Update docker/login-action action to v3 ( #27121 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 18:39:14 +02:00
cf9230fa1c
Update docker/build-push-action action to v5 ( #27120 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 18:38:55 +02:00
Claire