Matt Jankowski
bc3737f0c3
Add detail about running version on vips error failure ( #30858 )
2024-06-27 16:27:42 +00:00
Claire
b15a3614dc
Stub Vips::Error when not using libvips ( #30857 )
2024-06-27 15:25:27 +00:00
github-actions[bot]
6d1c1fd684
New Crowdin Translations (automated) ( #30851 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-27 08:00:04 +00:00
Claire
7a84b76bb1
Drop favicon.ico generation ( #30375 )
2024-06-26 13:44:08 +00:00
Claire
6f2771cb32
Merge commit '845fe1c6936a7b386fd74ae567c19600a88e795a' into glitch-soc/merge-upstream
2024-06-25 17:57:39 +02:00
Renaud Chaput
845fe1c693
Add the Interlingua locale ( #30828 )
2024-06-25 14:05:24 +00:00
Claire
21ca03581a
Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream
2024-06-24 19:39:42 +02:00
Tim Rogers
f6e466058a
Added check for STATSD_ADDR setting to emit a warning and proceed rather than crashing if the address is unreachable ( #30691 )
2024-06-24 14:41:04 +00:00
github-actions[bot]
61722b1b1f
New Crowdin Translations (automated) ( #30808 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-24 10:46:53 +00:00
Jeremy Kescher
b3f731abac
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-22 13:30:26 +02:00
Claire
cabd7c21fc
Merge commit '2cda1dd542b20a47245cb8d28a4f6f8750c2284c' into glitch-soc/merge-upstream
2024-06-19 19:37:37 +02:00
Claire
2cda1dd542
Fix compatibility with Redis < 6.2 again ( #30412 )
2024-06-19 16:59:37 +00:00
Jeremy Kescher
5e5f19b50e
Merge branch 'refs/heads/glitch' into develop
2024-06-19 17:49:06 +02:00
Jeremy Kescher
3f2e2c0923
Merge branch 'refs/heads/glitch' into develop
2024-06-19 17:20:56 +02:00
Claire
52e34a6bd6
Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-soc/merge-upstream
2024-06-19 11:59:06 +02:00
github-actions[bot]
80743e0e7f
New Crowdin Translations (automated) ( #30762 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-19 08:45:40 +00:00
Matt Jankowski
be19b94dea
Unpluralize mistakenly changed privacy template ( #30759 )
2024-06-18 21:34:17 +00:00
Claire
b0c979af49
Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream
2024-06-18 18:20:36 +02:00
github-actions[bot]
50db95b9a1
New Crowdin Translations (automated) ( #30746 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-18 12:39:36 +00:00
Jeremy Kescher
3fa67cbe7a
Make MASTODON_USE_LIBVIPS default to true
2024-06-18 01:15:03 +02:00
Jeremy Kescher
29ac8c0606
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-18 00:15:52 +02:00
Jeremy Kescher
895b479c23
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-17 22:52:08 +02:00
Claire
395b9011ee
Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, just upstream adding a method textually adjacent to
glitch-soc only code.
Ported upstream's change.
2024-06-17 18:30:28 +02:00
Claire
8089fa6935
Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflict because of glitch-soc's different theming system.
Ported upstream's change.
2024-06-17 18:14:14 +02:00
github-actions[bot]
35d52d7914
New Crowdin Translations (automated) ( #30723 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-17 12:13:23 +00:00
Claire
677f73f793
Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream
2024-06-17 13:41:58 +02:00
Jeremy Kescher
209f90f670
Merge branch 'refs/heads/glitch-soc' into develop
2024-06-16 05:32:45 +02:00
Matt Jankowski
980034e2e1
Fix Style/NilLambda cop in paperclip initializer ( #30695 )
2024-06-14 09:50:50 +00:00
Matt Jankowski
222ab80557
Fix Style/GlobalStdStream cop in environments/* files ( #30694 )
2024-06-14 09:50:33 +00:00
github-actions[bot]
a7264a2b42
New Crowdin Translations (automated) ( #30704 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-14 09:08:17 +00:00
Emelia Smith
3d9f00ae16
Fix unsafe URLs in audit log resulting from domain blocks ( #27139 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-14 07:54:09 +00:00
github-actions[bot]
dd587d29b6
New Crowdin Translations (automated) ( #30684 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-13 13:30:07 +00:00
github-actions[bot]
ced463360e
New Crowdin Translations (automated) ( #30666 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-12 10:48:31 +00:00
Claire
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
Matt Jankowski
665f6f09a0
Add expired/revoked scopes for doorkeeper models via extension modules ( #29936 )
2024-06-11 08:50:51 +00:00
Matt Jankowski
0e1110c947
Use SECRET_KEY_BASE_DUMMY feature as placeholder during asset compilation ( #30505 )
2024-06-10 20:08:04 +00:00
Claire
be68f8f4af
Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream
2024-06-10 18:20:08 +02:00
github-actions[bot]
bb27321781
New Crowdin Translations (automated) ( #30608 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-10 14:29:30 +00:00
Matt Jankowski
0cf91213c9
Opt in to remaining Rails 7.1 defaults ( #30332 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-10 06:32:20 +00:00
Claire
905e9fab97
Merge pull request #2696 from glitch-soc/i18n/crowdin/translations
...
New Crowdin Translations (automated)
2024-06-08 13:42:34 +02:00
Claire
01a9b37c20
Fix bogus translations
2024-06-08 13:28:41 +02:00
GitHub Actions
aab5b10c38
New Crowdin translations
2024-06-08 04:29:18 +00:00
Claire
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
Claire
80cd001e0a
Fix linting issue ( #30595 )
2024-06-07 14:32:29 +00:00
Isa S
773283ffb9
Make S3's retry limit a ENV variable ( #23215 )
2024-06-07 13:54:55 +00:00
Victor Dyotte
299ae9bf92
Add S3_KEY_PREFIX environment variable ( #30181 )
2024-06-07 12:29:30 +00:00
Matt Jankowski
a5e3b814a2
Remove Status/ivar/shapes regression check from test env ( #30580 )
2024-06-07 10:00:51 +00:00
Matt Jankowski
3dfc7267e2
Rename deprecated config option to enable_reloading in dev env ( #30577 )
2024-06-07 10:00:27 +00:00
github-actions[bot]
c1b0c1a5e4
New Crowdin Translations (automated) ( #30586 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-07 09:59:30 +00:00
Claire
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
github-actions[bot]
a729104a41
New Crowdin Translations (automated) ( #30575 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-06 08:53:28 +00:00
Eugen Rochko
a2505e8611
Add timeline of public posts about a trending link to REST API ( #30381 )
2024-06-06 08:43:04 +00:00
Emelia Smith
e02d23b549
Change read:me scope to profile scope ( #30357 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-06 07:30:10 +00:00
Eugen Rochko
5f15a892fa
Add support for libvips in addition to ImageMagick ( #30090 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-05 19:15:39 +00:00
github-actions[bot]
e4e3875452
New Crowdin Translations (automated) ( #30543 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-05 07:52:25 +00:00
Claire
974335e414
Add experimental server-side notification grouping ( #29889 )
2024-06-03 08:35:59 +00:00
github-actions[bot]
aa9b80f57d
New Crowdin Translations (automated) ( #30517 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-06-03 07:34:33 +00:00
Matt Jankowski
4d3748ac44
Fix rack attack match_type value typo in logging config ( #30514 )
2024-06-03 07:16:01 +00:00
Matt Jankowski
a22865a352
Add :email to filter parameter logging config ( #30492 )
2024-05-31 09:35:56 +00:00
github-actions[bot]
dac4eba46b
New Crowdin Translations (automated) ( #30499 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-31 09:26:52 +00:00
Jeremy Kescher
cb080ca3ef
Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0
2024-05-30 18:51:42 +02:00
github-actions[bot]
a0b525e50b
New Crowdin Translations (automated) ( #30477 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-30 14:54:51 +00:00
Claire
b8271f20c5
Merge commit '7f808ff6e9148f1cfe1e16d000e2405b6e31f243' into glitch-soc/merge-upstream
2024-05-30 15:41:31 +02:00
Claire
73a78cc19d
Fix rate-limiting incorrectly triggering a session cookie on most endpoints ( #30483 )
2024-05-30 12:56:18 +00:00
Claire
3fa0dd0b88
Merge pull request from GHSA-c2r5-cfqr-c553
...
* Add hardening monkey-patch to prevent IP spoofing on misconfigured installations
* Remove rack-attack safelist
2024-05-30 14:24:29 +02:00
Claire
16249946ae
Merge pull request from GHSA-q3rg-xx5v-4mxh
2024-05-30 14:14:04 +02:00
Claire
c827a98f19
Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
Emelia Smith
d20a5c3ec9
Fix: remove broken OAuth Application vacuuming & throttle OAuth Application registrations ( #30316 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-29 14:00:05 +00:00
Jeremy Kescher
6d448d46ff
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/actions/interactions.js
# app/javascript/flavours/glitch/reducers/statuses.js
2024-05-29 14:23:08 +02:00
github-actions[bot]
32c30bf0fd
New Crowdin Translations (automated) ( #30452 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-28 08:05:37 +00:00
Nick Schonning
87156f57b5
Enable Style/StringConcatenation ( #30428 )
2024-05-27 09:41:45 +00:00
github-actions[bot]
e5c3dc33a2
New Crowdin Translations (automated) ( #30421 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-27 09:35:45 +00:00
Claire
1a2a28eb4a
Fix rubocop warnings
2024-05-24 17:13:34 +02:00
Claire
d76106da12
Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream
2024-05-24 17:08:21 +02:00
Renaud Chaput
acc77c3836
Add instrumentation to the search services ( #30350 )
2024-05-24 13:13:23 +00:00
github-actions[bot]
54351d01f2
New Crowdin Translations (automated) ( #30410 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-24 08:26:38 +00:00
Claire
0e8633f6c7
Merge commit '3a862439dfc989c6c5741e007c2f4e0335fffe33' into glitch-soc/merge-upstream
2024-05-23 20:11:12 +02:00
github-actions[bot]
5b5a35cf96
New Crowdin Translations (automated) ( #30402 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-23 08:26:29 +00:00
Jeremy Kescher
d1856ea48d
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/mastodon/initial_state.js
2024-05-22 23:56:46 +02:00
Claire
22d12229b2
Merge commit '2c5ab8f647841ea8075ece50ccc9e12c21af8720' into glitch-soc/merge-upstream
2024-05-22 21:05:19 +02:00
Michael Stanclift
2c75cf8599
Add "Warning preset" link to admin navigation ( #26199 )
2024-05-22 09:05:33 +00:00
Claire
d3136e6d58
Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream
2024-05-21 12:06:38 +02:00
github-actions[bot]
eda2bdfc7a
New Crowdin Translations (automated) ( #30383 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-21 08:48:36 +00:00
Jeremy Kescher
fae98d1deb
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
2024-05-20 23:57:04 +02:00
Claire
e46321e63d
Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream
2024-05-20 12:17:36 +02:00
Renaud Chaput
9658d3e580
Use the job class as span name for Sidekiq root spans ( #30353 )
2024-05-20 08:01:04 +00:00
github-actions[bot]
8b75d18371
New Crowdin Translations (automated) ( #30358 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-20 07:41:38 +00:00
Jeremy Kescher
70c76a1f30
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-17 15:33:30 +02:00
Claire
57fb2cf948
Merge commit '12472e7f407c42bcff6ee204b9f1887b5824734f' into glitch-soc/merge-upstream
2024-05-17 12:33:41 +02:00
Claire
12472e7f40
Add emphasis on ActiveRecord Encryption configuration values being secret ( #30340 )
2024-05-17 09:28:40 +00:00
Jeong Arm
a627219b25
Fix moderation action logs ( #30342 )
2024-05-17 09:18:54 +00:00
github-actions[bot]
bff7769f5f
New Crowdin Translations (automated) ( #30336 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-17 08:41:35 +00:00
Claire
2810231180
Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Upstream renamed a helper method everywhere.
There was one glitch-soc line involving changes because of the local-only post
feature.
Ported upstream's change.
2024-05-16 19:30:10 +02:00
Matt Jankowski
1b6eb2c7f0
Enable YJIT when available ( #30310 )
2024-05-16 09:56:48 +00:00
Renaud Chaput
283a891e92
Allow to customise the OTEL service name prefix ( #30322 )
2024-05-16 09:28:10 +00:00
Emelia Smith
f0d6dc4519
Fix: Mark redirect uris field in Development > Application form as required ( #30311 )
2024-05-16 07:59:46 +00:00
github-actions[bot]
cdb042ae86
New Crowdin Translations (automated) ( #30319 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-16 07:50:19 +00:00
Emelia Smith
5fd56512de
Improve Report Notes and Account Moderation Notes ( #30288 )
2024-05-15 13:38:36 +00:00
Matt Jankowski
6beead3867
Move simplecov config into rails_helper ( #30302 )
2024-05-15 09:33:36 +00:00
github-actions[bot]
aad5e841b5
New Crowdin Translations (automated) ( #30290 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-15 08:53:57 +00:00
Claire
666760f450
Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream fixed a command we have modified in glitch-soc.
Updated as upstream did.
2024-05-14 20:47:14 +02:00
Claire
b5b84fad65
Fix OpenSearch compatibility issue ( #30278 )
2024-05-14 17:54:28 +00:00
Jeremy Kescher
74ed5bf354
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-14 18:56:01 +02:00
github-actions[bot]
3a7aec2807
New Crowdin Translations (automated) ( #30254 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-13 11:30:41 +00:00
Nick Schonning
13fb54920b
Enable Style/IfUnlessModifier RuboCop ( #30260 )
2024-05-13 09:54:15 +00:00
Jeremy Kescher
480be5e60c
Add changelog info for v4.3.0-alpha.3+glitch+cat+1.2.0
2024-05-12 00:25:31 +02:00
Jeremy Kescher
e73c612cb1
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-11 23:31:31 +02:00
Claire
f35ba6963d
Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream
2024-05-11 22:10:56 +02:00
Renaud Chaput
68b9fe824d
Add OpenTelemetry instrumentation ( #30130 )
...
Co-authored-by: Juliano Costa <juliano.costa@datadoghq.com>
Co-authored-by: Robb Kidd <robbkidd@honeycomb.io>
2024-05-10 12:40:20 +00:00
Matt Jankowski
040aaf3a48
Use default: ... assignment for Devise config, fixes Style/ClassVars cop ( #30214 )
2024-05-10 09:42:01 +00:00
github-actions[bot]
c9557bdd3b
New Crowdin Translations (automated) ( #30215 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-10 09:34:48 +00:00
Claire
21c904b0f6
Merge commit 'd8c428472356abd70aaf1f514b99114464ee7f61' into glitch-soc/merge-upstream
2024-05-07 20:30:17 +02:00
Claire
d8c4284723
Ensure custom favicon is converted to PNG and ICO ( #30208 )
2024-05-07 18:15:17 +00:00
Claire
f7dadc9f0b
Merge commit '5cd13ee4f19c112ea855063c2495e2874746f23a' into glitch-soc/merge-upstream
2024-05-07 12:13:02 +02:00
github-actions[bot]
ed556db395
New Crowdin Translations (automated) ( #30201 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-07 09:36:16 +00:00
Claire
016d194274
Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, upstream added helpers right next to glitch-soc only
helpers.
Added upstream's helpers.
- `spec/models/status_spec.rb`:
Not a real conflict, upstream added specs right next to glitch-soc only
specs.
Added upstream's tests.
2024-05-06 17:53:51 +02:00
Claire
2fe1b8d169
Add API to get multiple accounts and statuses ( #27871 )
...
Co-authored-by: noellabo <noel.yoshiba@gmail.com>
2024-05-06 15:19:15 +00:00
Fawaz Farid
bc24c4792d
Allow admins to configure instance favicon and logo ( #30040 )
2024-05-06 15:06:52 +00:00
Emelia Smith
116f01ec7d
Implement RFC 8414 for OAuth 2.0 server metadata ( #29191 )
2024-05-06 13:17:56 +00:00
github-actions[bot]
9be2c02e52
New Crowdin Translations (automated) ( #30169 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-06 08:36:29 +00:00
Claire
3789d9f825
Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
Switched to using upstream's implementation of the tests.
2024-05-04 16:28:30 +02:00
Claire
f09f5b35f2
Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream refactored this file a bit, moving validation limits to constants.
We already had a similar change, although with different constant names.
Updated to match upstream's code.
The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`
2024-05-04 16:12:51 +02:00
Claire
a76980a229
Merge commit 'f0c9cbaf3b079700b8179222d409c644dfd8ff66' into glitch-soc/merge-upstream
2024-05-04 15:40:07 +02:00
Claire
d6f9c97ae4
Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream
2024-05-04 15:24:22 +02:00
Claire
bac4026d80
Merge commit '85fdbd0ad53837c9209acf3fb45811d5bae41cd9' into glitch-soc/merge-upstream
2024-05-04 15:10:54 +02:00
Claire
bceb45adda
Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/entrypoints/common.js`:
Upstream moved everything from `app/javascript/packs` to
`app/javascript/entrypoints` while this file was a glitch-soc
addition. Moved it like the rest.
- `tsconfig.json`:
Conflict due to glitch-soc's flavor.
Updated like upstream.
Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`
2024-05-04 14:59:00 +02:00
Claire
33368e3e79
Change ActiveRecordEncryption variable to be more explicit ( #30151 )
2024-05-03 09:26:24 +00:00
github-actions[bot]
d5444a2c6c
New Crowdin Translations (automated) ( #30160 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-03 09:15:06 +00:00
Matt Jankowski
1e7d5d2957
Update devise-two-factor to version 5.0.0 ( #28325 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-02 09:31:41 +00:00
github-actions[bot]
309f352e6a
New Crowdin Translations (automated) ( #30140 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-05-02 08:57:30 +00:00
Claire
b039e62194
Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream
2024-05-01 19:49:59 +02:00
Claire
eeefb7cdbc
Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream
2024-05-01 19:42:34 +02:00
Claire
6204d13a2e
Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
There was an extra newline in glitch-soc for some reason.
Removed it.
2024-05-01 19:38:34 +02:00
Claire
360590ecd8
Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
Conflict due to glitch-soc's local-only posting feature.
Refactored as upstream did but kept local changes.
2024-05-01 19:30:41 +02:00
Claire
946bd2e7e1
Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream
2024-05-01 19:16:48 +02:00
Claire
6f342a6d4c
Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict caused by our different theme systems.
Ported upstream's changes.
- `app/models/account.rb`:
Upstream basically made a change we already made.
Moved constant declaration to match upstream.
2024-05-01 18:56:48 +02:00
Claire
9ce82a35cb
Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream
2024-05-01 18:42:26 +02:00
Claire
3503fe1865
Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream
2024-05-01 17:26:21 +02:00
Claire
15f6d2d038
Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
Conflict due to glitch-soc having a different default site name.
Updated the tests as upstream did, keeping glitch-soc's default name.
2024-05-01 17:22:02 +02:00
Claire
2c386d4cfe
Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream
2024-05-01 17:06:49 +02:00
Claire
7f404fd635
Merge commit '90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16' into glitch-soc/merge-upstream
2024-05-01 16:47:25 +02:00
Claire
3f61981f5d
Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream
2024-05-01 14:50:16 +02:00
Claire
7b46517c38
Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream
2024-05-01 14:31:14 +02:00
Claire
a6147a831f
Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/themes.rb`
- `app/views/layouts/application.html.haml`
- `app/views/layouts/embedded.html.haml`
- `app/views/layouts/error.html.haml`
- `config/settings.yml`
All these conflicts are because glitch-soc and upstream have different theming
systems and upstream changed a few things to have dynamic theme selection based
on system settings.
Conflicts were solved to take that into account, and `current_theme` has been
changed in the process to return a tuple of `[flavour, skin]` to be used in
the `theme_style_tags` helper.
2024-05-01 14:25:47 +02:00
Matt Jankowski
75470f1256
Use implicit dotenv load ( #30121 )
2024-04-30 13:00:39 +00:00
github-actions[bot]
56821ed879
New Crowdin Translations (automated) ( #30128 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-30 09:05:53 +00:00
github-actions[bot]
9be7efedf0
New Crowdin Translations (automated) ( #30092 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-29 08:15:43 +00:00
Claire
7208edbd37
Replace use_pack, layouts/theme and @theme by new helpers
...
Packs are now loaded from views, just like upstream, and are
identified by their filenames. The definition of `theme.yml` has
changed as such:
- `pack_directory` is now required
- `pack` is now unused
- `signed_in_preload` has been introduced
2024-04-28 15:45:42 +02:00
Claire
c3e12a4dfa
Change how theme style packs are loaded
...
Load the `common` style pack, and then charge the style pack for the current
skin, independent from any selected JS pack.
2024-04-28 15:45:41 +02:00
Claire
62bc36416f
Get rid of app/javascript/core
...
Have all flavors implement everything they need instead.
2024-04-28 15:04:52 +02:00
Michael Stanclift
bb8c6346fb
Reword and rearrange Content Retention page ( #27733 )
2024-04-26 15:17:41 +00:00
github-actions[bot]
5201882a23
New Crowdin Translations (automated) ( #30077 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-26 10:05:18 +00:00
github-actions[bot]
85fdbd0ad5
New Crowdin Translations (automated) ( #30062 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-25 08:50:54 +00:00
github-actions[bot]
ebcf9840f4
New Crowdin Translations (automated) ( #30050 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-24 08:45:24 +00:00
Matt Jankowski
3f6887557b
Move JS source from packs to entrypoints ( #30037 )
2024-04-23 16:45:12 +00:00
Matt Jankowski
32ead51e5a
Add material design icons to admin/settings views ( #27780 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-23 16:43:49 +00:00
Emelia Smith
049b159beb
Add read:me OAuth 2.0 scope, allowing more limited access to user data ( #29087 )
2024-04-23 11:47:00 +00:00
github-actions[bot]
d754b15afb
New Crowdin Translations (automated) ( #30034 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-23 09:07:05 +00:00
renovate[bot]
483fabf48a
Update dependency http to '~> 5.2.0' ( #30027 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-22 14:02:47 +00:00
Claire
2ef098d01c
Revert "Rely on dotenv autoload instead of explicit call ( #30007 )" ( #30028 )
2024-04-22 14:02:24 +00:00
Tim Rogers
1ca6ff8ca5
Fixed crash when supplying FFMPEG_BINARY environment variable ( #30022 )
2024-04-22 09:00:24 +00:00
github-actions[bot]
3655fb6a22
New Crowdin Translations (automated) ( #30014 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-22 08:42:35 +00:00
Matt Jankowski
18737aad49
Rely on dotenv autoload instead of explicit call ( #30007 )
2024-04-22 08:31:20 +00:00
Matt Jankowski
35b517c207
Remove remnants of capistrano ( #30009 )
2024-04-19 20:53:01 +00:00
Matt Jankowski
369b2ef0ed
Fix Style/TrailingCommaInHashLiteral cop ( #30004 )
2024-04-19 20:52:01 +00:00
Matt Jankowski
c7384adc00
Fix Style/TrailingCommaInArguments cop ( #30003 )
2024-04-19 20:37:18 +00:00
Matt Jankowski
933189887b
Fix Style/StringLiterals cop ( #30005 )
2024-04-19 20:33:00 +00:00
Matt Jankowski
8d47ba893a
Fix Style/PercentLiteralDelimiters cop ( #30006 )
2024-04-19 20:32:26 +00:00
Matt Jankowski
f386eb6c63
Replace deprecated dotenv-rails gem with dotenv gem ( #29173 )
2024-04-19 14:25:14 +00:00
github-actions[bot]
ec71c02c4b
New Crowdin Translations (automated) ( #29994 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-19 13:57:43 +00:00
github-actions[bot]
443186ff40
New Crowdin Translations (automated) ( #29980 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-18 11:18:39 +00:00
Matt Jankowski
828299e71c
Enable AR Encryption ( #29831 )
2024-04-17 09:19:02 +00:00
github-actions[bot]
c35042b7eb
New Crowdin Translations (automated) ( #29972 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-17 09:07:13 +00:00
github-actions[bot]
285d4123b5
New Crowdin Translations (automated) ( #29955 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-16 08:36:21 +00:00
github-actions[bot]
4e78cb9988
New Crowdin Translations (automated) ( #29939 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-15 09:29:39 +00:00
Matt Jankowski
0d9ad96d3f
Rename PremailerWebpackStrategy -> PremailerBundledAssetStrategy ( #29934 )
2024-04-15 09:16:59 +00:00
github-actions[bot]
5992df0762
New Crowdin Translations (automated) ( #29920 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-12 08:19:48 +00:00
Jeremy Kescher
2df3b9f803
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/serializers/initial_state_serializer.rb
2024-04-11 21:50:48 +02:00
github-actions[bot]
20b1e55f24
New Crowdin Translations (automated) ( #29903 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-11 10:30:31 +00:00
github-actions[bot]
13faf26315
New Crowdin Translations (automated) ( #29859 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-08 13:44:54 +00:00
Claire
0e76b919b5
Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream
2024-04-06 21:48:35 +02:00
Jeremy Kescher
7122d5381c
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/features/notifications/components/notification.jsx
2024-04-06 21:03:55 +02:00
Claire
777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
Claire
903dc53522
Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
Claire
f2b23aa5f3
Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Upstream added a navigation item while glitch-soc had an additional one.
Ported upstream changes.
2024-04-06 19:35:21 +02:00
github-actions[bot]
8a64406d34
New Crowdin Translations (automated) ( #2668 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 18:18:06 +02:00
github-actions[bot]
56d13069cd
New Crowdin Translations (automated) ( #29836 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-03 09:04:29 +00:00
Matt Jankowski
edde54e991
Update stoplight to version 4.1.0 ( #28366 )
2024-04-02 15:47:40 +00:00
github-actions[bot]
c717747603
New Crowdin Translations (automated) ( #29812 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-02 09:26:06 +00:00
github-actions[bot]
f96648d41c
New Crowdin Translations (automated) ( #29796 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-29 13:35:50 +00:00
github-actions[bot]
8a498f4e65
New Crowdin Translations (automated) ( #29785 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-28 14:48:09 +00:00
github-actions[bot]
1025fff6b9
New Crowdin Translations (automated) ( #29772 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-27 21:19:03 +00:00
github-actions[bot]
b3d970bdb8
New Crowdin Translations (automated) ( #29756 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-26 09:49:19 +00:00
Renaud Chaput
02ea161506
Support "system" theme setting (light/dark theme depending on user system preference) ( #29748 )
...
Co-authored-by: Nishiki Liu <hello@nshki.com>
2024-03-26 09:25:49 +00:00
github-actions[bot]
799e3be9bd
New Crowdin Translations (automated) ( #29726 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-25 11:07:38 +00:00
github-actions[bot]
5db5fa879b
New Crowdin Translations (automated) ( #29708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-22 14:50:03 +00:00
Matt Jankowski
a59f5694fe
Add empty line after ✨ magic ✨ frozen string comment ( #29696 )
2024-03-21 14:12:50 +00:00
github-actions[bot]
c007dd5dd2
New Crowdin Translations (automated) ( #29687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-21 09:57:45 +00:00
Jeremy Kescher
0353a3d759
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
# app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
2024-03-20 22:59:13 +01:00
Claire
44bf7b8128
Add notifications of severed relationships ( #27511 )
2024-03-20 15:37:21 +00:00
Claire
eb3aed9545
Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream touched a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
2024-03-20 12:27:52 +01:00
github-actions[bot]
6c0b1a41a1
New Crowdin Translations (automated) ( #29657 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-20 08:39:42 +00:00
Claire
876aa35350
Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream updated a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
- `yarn.lock`:
Upstream updated a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
2024-03-19 19:21:12 +01:00
Jeremy Kescher
a53f2cf970
Merge branch 'glitch-soc' into develop
2024-03-19 18:31:27 +01:00
Claire
bc6f9befde
Change “Notifications” settings page to “E-mail notifications” ( #29646 )
2024-03-19 13:40:16 +00:00
Matt Jankowski
6c68c3c0ce
Introduce inline_svg gem, minimal usage, prep for material design icons ( #29612 )
2024-03-19 09:03:15 +00:00
github-actions[bot]
4e61bce4e9
New Crowdin Translations (automated) ( #29641 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-19 08:36:52 +00:00
Claire
cf08a438e7
Add badge on account card in report moderation interface when account is already suspended ( #29592 )
2024-03-19 08:20:53 +00:00
Matt Jankowski
ecdbf15ebe
Remove unused link_to_older and link_to_newer helper methods ( #29620 )
2024-03-18 08:54:46 +00:00
github-actions[bot]
04817e965a
New Crowdin Translations (automated) ( #29623 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-18 08:47:48 +00:00
Claire
82c2af0356
Fix user_mailer.welcome.hashtags_recent_count not having plural form ( #29607 )
2024-03-16 16:38:20 +00:00
Claire
2e49bc97b0
Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream
2024-03-15 12:20:32 +01:00
github-actions[bot]
6865fda593
New Crowdin Translations (automated) ( #29603 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-15 10:02:10 +00:00
Jeremy Kescher
21a23b58ab
Merge branch 'glitch-soc' into develop
2024-03-14 21:46:57 +01:00
Jeremy Kescher
caccc2e0f4
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# README.md
# app/javascript/flavours/glitch/components/status.jsx
# app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
# app/javascript/flavours/glitch/locales/en.json
# app/javascript/flavours/glitch/reducers/compose.js
# app/javascript/flavours/glitch/styles/components.scss
# app/javascript/mastodon/reducers/compose.js
# app/models/notification.rb
2024-03-14 20:01:30 +01:00
Claire
e91ede5be6
Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream
2024-03-14 17:27:16 +01:00
Matt Jankowski
049d9171eb
Use with_options for shared option in accounts#show routing block ( #28914 )
2024-03-14 10:03:38 +00:00
Matt Jankowski
79e7590578
Clean up activitypub module route scope near instance actor ( #29579 )
2024-03-14 09:18:46 +00:00
Matt Jankowski
65e8349980
Clean up activitypub module route scope near collections/boxes ( #29580 )
2024-03-14 09:18:41 +00:00
Matt Jankowski
18ffd4d925
Add module instances route scope in api routes ( #29581 )
2024-03-14 09:18:36 +00:00
Matt Jankowski
01ecc80118
Add module accounts route scope in api routes ( #29582 )
2024-03-14 09:18:31 +00:00
github-actions[bot]
5aea35de13
New Crowdin Translations (automated) ( #29587 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-14 09:00:42 +00:00
Claire
48134bcd10
Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream
2024-03-13 20:13:29 +01:00
Claire
27ffc09847
Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream
2024-03-13 18:56:40 +01:00
github-actions[bot]
171948b910
New Crowdin Translations (automated) ( #29563 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-13 12:42:44 +00:00
github-actions[bot]
dc36b961aa
New Crowdin Translations (automated) ( #29554 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-12 09:03:51 +00:00
Claire
a5127d0ef8
Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
glitch-soc has an extra `:destroy` action on notifications for historical reasons.
Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01:00
Matt Jankowski
a38e424185
Use unchanging github links in docs/comments ( #29545 )
2024-03-11 15:14:55 +00:00
Eugen Rochko
c10bbf5fe3
Add notification policies and notification requests in web UI ( #29433 )
2024-03-11 15:02:21 +00:00
Eugen Rochko
5b3a8737d6
Add hints for rules ( #29539 )
2024-03-11 08:57:07 +00:00
github-actions[bot]
f85168b189
New Crowdin Translations (automated) ( #29467 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-11 07:37:04 +00:00
Eugen Rochko
50b17f7e10
Add notification policies and notification requests ( #29366 )
2024-03-07 14:53:37 +00:00
Claire
45e56db8e4
Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept our version.
2024-03-05 16:25:50 +01:00
Jeremy Kescher
6aa17a7c1b
Merge branch 'glitch-soc' into develop
2024-03-03 03:12:37 +01:00
Dave MacLeod
b6b94c971f
Add Interlingue to available_locales ( #28630 )
2024-03-01 17:51:22 +00:00
Claire
159e500749
Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream
2024-03-01 18:34:48 +01:00
HTeuMeuLeu
934cab7508
New welcome email ( #28883 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-03-01 12:16:53 +00:00
Jeremy Kescher
05747febb6
Merge branch 'glitch-soc' into develop
2024-02-29 19:32:12 +01:00
Claire
4d7e7cc562
Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream
2024-02-29 18:24:47 +01:00
Claire
1c4f36422d
Fix bogus translation files
2024-02-29 12:51:22 +01:00
github-actions[bot]
cdf5098166
New Crowdin Translations (automated) ( #29452 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-29 09:38:33 +00:00
GitHub Actions
ab195bcee1
New Crowdin translations
2024-02-29 04:27:18 +00:00
Jeremy Kescher
de1e89f42c
Merge branch 'glitch-soc' into develop
2024-02-28 23:01:31 +01:00
Claire
ccdf56085d
Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream
2024-02-28 20:37:38 +01:00
github-actions[bot]
7f84bbfd92
New Crowdin Translations (automated) ( #29430 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-28 12:14:42 +00:00
Claire
a482932649
Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Not a real conflict, upstream fixed a bug in a line adjacent to code
modified by glitch-soc.
Ported upstream's change.
2024-02-27 19:20:57 +01:00
github-actions[bot]
bc4c5ed918
New Crowdin Translations (automated) ( #29423 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-27 14:53:53 +00:00
Claire
67ca8bb56a
Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Change applied to `app/javascript/core/admin.js` instead.
2024-02-26 17:43:16 +01:00
github-actions[bot]
98e3dc2578
New Crowdin Translations (automated) ( #29382 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-26 13:03:06 +00:00
Jeremy Kescher
009251a17d
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/initial_state.js
# app/serializers/initial_state_serializer.rb
# config/initializers/chewy.rb
# config/locales/en.yml
# config/locales/ja.yml
2024-02-24 19:11:05 +01:00
Claire
2dc244784c
Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream
2024-02-24 15:43:15 +01:00
Claire
1ad91dece8
Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Changes applied to `app/javascript/core/admin.js` instead.
2024-02-24 15:35:56 +01:00
Claire
7901dc9e24
Merge commit '491dd9764244c8adf37861f00d916c96bdbfdaf8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/workers/scheduler/auto_close_registrations_scheduler.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 15:33:36 +01:00
Claire
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
2024-02-24 15:02:28 +01:00
Claire
ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
2024-02-24 14:46:14 +01:00
Claire
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
Claire
5b9ddfcfcc
Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream
2024-02-24 14:18:16 +01:00
Jeremy Kescher
6e635a4283
Clarify English locale
2024-02-24 14:05:49 +01:00
Claire
20615a516d
Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream
2024-02-24 13:53:59 +01:00
noellabo
d518f06eae
Add reject blurhash to Admin setting
2024-02-24 11:14:32 +01:00
Jeremy Kescher
a4e12a484d
Merge branch 'glitch-soc' into develop
2024-02-24 11:11:24 +01:00
Paolo Melchiorre
aca691726b
Fix #21492 Add missing WebP hint in avatar/header localizations ( #22395 )
2024-02-23 22:10:46 +00:00
github-actions[bot]
bba4118ddd
New Crowdin Translations (automated) ( #29369 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-23 15:21:02 +00:00
Claire
d23f445527
Automatically switch from open to approved registrations in absence of moderators ( #29318 )
2024-02-22 20:45:40 +01:00
Claire
b71904816a
Change registrations to be disabled by default for new servers ( #29280 )
2024-02-22 13:28:19 +00:00
github-actions[bot]
449fcf1ae7
New Crowdin Translations (automated) ( #29343 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-22 10:37:48 +00:00
Claire
2751acb6cd
Automatically switch from open to approved registrations in absence of moderators ( #29318 )
2024-02-21 17:45:06 +00:00
github-actions[bot]
fd2b6c29c6
New Crowdin Translations (automated) ( #29311 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-21 11:24:44 +00:00
github-actions[bot]
9a2b9d1484
New Crowdin Translations (automated) ( #29298 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-20 09:23:40 +00:00
github-actions[bot]
ad16362efe
New Crowdin Translations (automated) ( #29255 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-19 13:25:45 +00:00
noellabo
5255bd08e0
Add reject pattern to Admin setting (Ported to Glitch Soc)
...
# Conflicts:
# app/views/admin/settings/shared/_links.html.haml
# config/routes/admin.rb
2024-02-17 18:55:57 +01:00
Matt Jankowski
1d9d14b8de
Use abort instead of warn(); exit in boot.rb env check ( #29209 )
2024-02-16 14:29:24 +00:00
Jeremy Kescher
ce878a78bb
Merge branch 'glitch-soc' into develop
2024-02-16 14:48:08 +01:00
github-actions[bot]
1c93d625c6
New Crowdin Translations (automated) ( #29195 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-16 07:51:13 +00:00
Claire
e7ca82762d
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 23:12:59 +01:00
Claire
d4d0565b0f
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 21:49:45 +00:00
Jeremy Kescher
1c9291adcd
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/styles/components/accounts.scss
# app/javascript/flavours/glitch/styles/components/status.scss
2024-02-14 18:02:38 +01:00
Claire
3c3ef8b9d3
Add sidekiq_unique_jobs:delete_all_locks task and disable sidekiq-unique-jobs UI by default ( #29199 )
2024-02-14 13:42:15 +01:00
Claire
554e2a019e
Add sidekiq_unique_jobs:delete_all_locks task and disable sidekiq-unique-jobs UI by default ( #29199 )
2024-02-14 12:12:13 +00:00
Emelia Smith
eae436c5a8
Disable administrative doorkeeper routes ( #29187 )
2024-02-13 20:03:00 +01:00
Emelia Smith
46142cdbdd
Disable administrative doorkeeper routes ( #29187 )
2024-02-13 18:11:47 +00:00
github-actions[bot]
6482948547
New Crowdin Translations (automated) ( #29156 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-12 09:59:05 +00:00
Claire
8125dae5a8
Rename ES_CA_CERT to ES_CA_FILE for consistency ( #29147 )
2024-02-12 09:54:06 +00:00
github-actions[bot]
c07028b2fa
New Crowdin Translations (automated) ( #29152 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-09 09:55:30 +00:00
github-actions[bot]
2a362d62a8
New Crowdin Translations (automated) ( #29145 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-08 09:43:02 +00:00
github-actions[bot]
17052714a2
New Crowdin Translations (automated) ( #29121 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-07 12:38:37 +00:00
Claire
2912829411
Add support for specifying custom CA cert for Elasticsearch ( #29122 )
2024-02-07 12:09:43 +00:00
Jeremy Kescher
40ef7b3849
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/serializers/initial_state_serializer.rb
2024-02-06 22:58:23 +01:00
Claire
19f1ffe287
Fix self-destruct schedule not actually replacing initial schedule ( #29049 )
2024-02-06 21:00:09 +01:00
github-actions[bot]
90ccf7beb2
New Crowdin Translations (automated) ( #28965 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-06 18:47:44 +00:00
Claire
64300e0fe3
Fix self-destruct schedule not actually replacing initial schedule ( #29049 )
2024-02-06 15:32:09 +00:00
Matt Jankowski
ce0d134147
Add redirect_with_vary to AllowedMethods for Style/FormatStringToken cop ( #28973 )
2024-01-30 15:39:01 +00:00
Jeremy Kescher
c2c2afc294
Merge branch 'glitch-soc' into develop
2024-01-28 02:29:46 +01:00
Claire
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
github-actions[bot]
ae9c675930
New Crowdin Translations (automated) ( #2564 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-26 19:45:04 +01:00
github-actions[bot]
45287049ab
New Crowdin Translations (automated) ( #28923 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-26 09:15:55 +00:00
Claire
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
Matt Jankowski
c8f59d2ca4
Fix Style/TernaryParentheses cop ( #28387 )
2024-01-25 13:28:49 +00:00
github-actions[bot]
59d2ea0d82
New Crowdin Translations (automated) ( #28899 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-25 13:00:44 +00:00
Claire
22cfab0ebf
Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
Upstream made style fixes, while glitch-soc had extra options.
Ported upstream's style fixes.
2024-01-24 20:42:53 +01:00
