Commit Graph

3785 Commits (c75fe09e2b1283c600591d76918921a71ceae989)

Author SHA1 Message Date
Claire c75fe09e2b Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream 2024-07-18 17:56:25 +02:00
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