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
