CloudToys/puyopuyotetr.is
1
0
Fork 0
Code
22,973 Commits 1 Branch 1 Tag 344 MiB
441af2632d
Commit Graph

3884 Commits

Author SHA1 Message Date
Renaud Chaput
f587ff643f
Grouped Notifications UI (#30440) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-18 14:36:09 +00:00
github-actions[bot]
7d090b2ab6
New Crowdin Translations (automated) (#31055) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-18 08:00:29 +00:00
Claire
5e7720d11b Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream 2024-07-17 22:20:12 +02:00
github-actions[bot]
00c110ac7b
New Crowdin Translations (automated) (#31047) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-17 07:23:07 +00:00
Claire
c546757cd1 Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream 2024-07-16 17:54:36 +02:00
github-actions[bot]
66430cb25c
New Crowdin Translations (automated) (#31038) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-16 15:24:56 +00:00
Emelia Smith
aa88aca0ad
Add optional OAuth application to reports (#30539) 2024-07-16 13:23:08 +00:00
Michael Stanclift
905921b2ef
Add missing "Update Report" string in audit log (#31033) 2024-07-16 07:06:19 +00:00
Claire
64b2c712d4 Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because upstream refactored theme-related code, and glitch-soc has
  a different theming system.
 2024-07-15 18:51:38 +02:00
github-actions[bot]
17117109ad
New Crowdin Translations (automated) (#31018) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-15 07:44:37 +00:00
mogaminsk
d61b536df3
Add i18n strings for instance favicon and logo settings label (#31016) 2024-07-15 07:38:48 +00:00
Claire
55cf5e0188 Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream 2024-07-12 13:41:54 +02:00
github-actions[bot]
28ad3588e4
New Crowdin Translations (automated) (#31006) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-12 08:25:27 +00:00
Claire
ad52b04a1c
Add setting to disable hover cards (#30931) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-07-11 19:42:58 +00:00
Claire
db0b12e5dc Merge commit '8c8bee5a36e0cd0b5d35903f8891896447c3e060' into glitch-soc/merge-upstream 2024-07-11 21:07:03 +02:00
Matt Jankowski
6c37529723
Use module: :auth to wrap devise_for routes config (#30990) 2024-07-11 11:13:55 +00:00
github-actions[bot]
c244b70dc2
New Crowdin Translations (automated) (#30993) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-11 10:38:35 +00:00
github-actions[bot]
182fee1c45
New Crowdin Translations (automated) (#2738) 
* New Crowdin translations

* Fix bogus no.yml

* Fix bogus simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-10 18:18:15 +02:00
Claire
52fb4f16ef Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream 2024-07-10 16:58:06 +02:00
Renaud Chaput
36592d10aa
Change Sidekiq readiness file to use an environment variable (#30988) 2024-07-10 12:57:25 +00:00
github-actions[bot]
9984fca9a0
New Crowdin Translations (automated) (#30983) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-10 10:40:19 +00:00
Claire
388672ff0d Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream 2024-07-09 20:39:09 +02:00
Renaud Chaput
7542a134d5
Add a file for Sidekiq to signal it is ready to process jobs (#30971) 2024-07-09 10:47:08 +00:00
Matt Jankowski
f47d761e12
Remove unneeded controller option in routes (#30958) 2024-07-09 07:34:19 +00:00
Matt Jankowski
7a30c68953
Use scope module: ... block for .well-known routes (#30959) 2024-07-09 07:34:15 +00:00
Claire
6a55232988 Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00
github-actions[bot]
1a37862a76
New Crowdin Translations (automated) (#30940) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-08 08:03:44 +00:00
Matt Jankowski
c29fdadefd
Use scope module: ... for more API routes (#30935) 2024-07-08 07:21:49 +00:00
Claire
11dd51ef44 Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream and glitch-soc had different comments, some comments got updated upstream.
  Updated them in glitch-soc accordingly.
 2024-07-06 21:02:42 +02:00
github-actions[bot]
81547845ac
New Crowdin Translations (automated) (#30925) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-05 09:09:40 +00:00
Matt Jankowski
8c375d8a5c
Use scope module: ... for settings/2FA routes (#30919) 2024-07-05 08:57:54 +00:00
Claire
8de5df225e
Change instructions to use bundle exec rails instead of rake (#30917) 2024-07-05 08:54:45 +00:00
Claire
e61a7794f8 Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict because glitch-soc has a different list of allowed tags.
  Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
  Conflict because of glitch-soc's default settings.
  Updated accordingly.
 2024-07-04 17:12:14 +02:00
github-actions[bot]
8331f9e379
New Crowdin Translations (automated) (#30916) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-04 08:46:27 +00:00
Claire
70ff7a7c69 Merge commit '9be77fc0dbb01c1a8a54cd3da97e16c7941df367' into glitch-soc/merge-upstream 2024-07-03 22:10:41 +02:00
David Roetzel
9be77fc0db
Revert "Add system check for missing database indexes" (#30909) 2024-07-03 13:36:42 +00:00
github-actions[bot]
dd85e3bcc5
New Crowdin Translations (automated) (#30901) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-03 07:30:30 +00:00
David Roetzel
ebd8e1bbb6
Add system check for missing database indexes (#30888) 2024-07-03 07:19:54 +00:00
github-actions[bot]
1fc14e324b
New Crowdin Translations (automated) (#30890) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-02 08:41:54 +00:00
Claire
92dcc50278 Merge commit 'd3f504245cab5a9a0e89262e0a1398d035dffac9' into glitch-soc/merge-upstream 2024-07-01 20:45:13 +02:00
Eugen Rochko
20fa9ce484
Add timeline of public posts about a trending link in web UI (#30840) 2024-07-01 14:45:48 +00:00
Claire
d270165be3 Merge commit 'aeefe5b2bea6e0fb511f029c2aacdefa7bd41eb8' into glitch-soc/merge-upstream 2024-07-01 12:05:39 +02:00
github-actions[bot]
7756db6551
New Crowdin Translations (automated) (#30873) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-01 08:34:38 +00:00
Claire
d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
github-actions[bot]
a5134f2695
New Crowdin Translations (automated) (#30867) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-28 08:33:57 +00:00
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
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
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
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
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
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
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
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
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
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
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
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