mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,353 Commits
70 Branches
24 Tags
380 MiB
Commit Graph

4097 Commits (65caf6c085fef30dc76f314ada2be08f4e76997b)

Author SHA1 Message Date
github-actions[bot] 4252b13a4b
New Crowdin Translations (automated) (#32990) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-20 08:24:50 +00:00
github-actions[bot] 9fc2fc2251
New Crowdin Translations (automated) (#32969) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-19 09:05:39 +00:00
Shlee 06fcee099a
DB Replica database_tasks as ENV (#32908) 2024-11-19 08:54:28 +00:00
Matt Jankowski c0c34d35e2
Move self destruct check to `config_for` and add constant for verifier string (#32943) 2024-11-18 09:57:16 +00:00
github-actions[bot] 02985aae69
New Crowdin Translations (automated) (#32927) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-18 09:20:37 +00:00
Renaud Chaput bcf5d30e01
Add OpenTelemetry VCS attributes (#32904) 2024-11-18 08:41:09 +00:00
Claire 4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
github-actions[bot] c546aa57cb
New Crowdin Translations (automated) (#32900) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-15 10:30:11 +00:00
Emelia Smith ddfb3d123b
Improve display of statuses in admin panel (#30813) 2024-11-15 09:38:01 +00:00
github-actions[bot] aaebf142aa
New Crowdin Translations (automated) (#32884) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-14 09:39:33 +00:00
Jaz-Michael King 03ecf5df3b
Adds a range of reserved usernames to reduce potential misuse by malicious actors (#32828) 2024-11-13 13:10:01 +00:00
github-actions[bot] baad795384
New Crowdin Translations (automated) (#32868) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-13 09:33:02 +00:00
Matt Jankowski ace4268308
Remove unused `api/v1/polls#create` route (#32860) 2024-11-12 17:27:23 +00:00
Claire f5f6273d2b
Move `ALLOWED_PRIVATE_ADDRESSES` parsing to an initializer (#32850) 2024-11-12 13:00:52 +00:00
github-actions[bot] 0d06d70d11
New Crowdin Translations (automated) (#32811) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-12 08:47:59 +00:00
Emelia Smith a34edc211f
Add audit logging to Relays (#32819) 2024-11-12 08:35:08 +00:00
Matt Jankowski c099797700
Use `mastodon` config namespace to load software update default value via `config_for` (#30534) 2024-11-12 08:28:31 +00:00
github-actions[bot] d29f27fad7
New Crowdin Translations (automated) (#2851) 
* New Crowdin translations

* Update simple_form.no.yml

* Update no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-11-10 22:07:04 +01:00
Emelia Smith e22ec25077
Fix typo in account unlocked localisation (#32821) 2024-11-10 12:26:51 +00:00
Claire f0f807cec7 Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream 2024-11-10 13:18:43 +01:00
github-actions[bot] 8df867b20a
New Crowdin Translations (automated) (#32803) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-08 09:53:47 +00:00
Matt Jankowski 41227aeb95
Update Rails to version 7.2.2 (#30391) 2024-11-07 14:58:20 +00:00
Matt Jankowski ae667624ac
Use `with_options` for shared settings options in routes (#30847) 2024-11-07 10:07:04 +00:00
github-actions[bot] 4ed3ce2377
New Crowdin Translations (automated) (#32793) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-07 09:45:05 +00:00
github-actions[bot] 871e3b25e8
New Crowdin Translations (automated) (#32782) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-06 08:21:13 +00:00
Eugen Rochko d6349c0e9a
Add year in review feature to web UI (#32709) 2024-11-05 14:40:07 +00:00
David Roetzel d60ef3f17e
Disable `httplog` gem in production (#32776) 2024-11-05 08:55:34 +00:00
github-actions[bot] 933fa81baf
New Crowdin Translations (automated) (#32772) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-05 08:41:09 +00:00
Matt Jankowski a139dac18e
Remove cookie rotator (#32289) 2024-11-04 09:11:00 +00:00
github-actions[bot] 2271b39a5c
New Crowdin Translations (automated) (#32733) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-04 08:56:11 +00:00
Claire f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
 2024-11-03 20:51:58 +01:00
github-actions[bot] e78db58b65
New Crowdin Translations (automated) (#32708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-31 10:01:05 +00:00
Emelia Smith e1b7382ea6
Add userinfo oauth endpoint (#32548) 2024-10-30 14:38:10 +00:00
github-actions[bot] 0a599d08d8
New Crowdin Translations (automated) (#32695) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-30 10:02:02 +00:00
github-actions[bot] 244aaf9a38
New Crowdin Translations (automated) (#32687) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-29 09:29:22 +00:00
github-actions[bot] 0426cb78f7
New Crowdin Translations (automated) (#32589) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-28 13:23:13 +00:00
Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
 2024-10-26 13:38:07 +02:00
Matt Jankowski 97b18d10b4
Move hcaptcha service config to `config_for` yml (#30662) 2024-10-23 14:25:43 +00:00
Matt Jankowski 35f008aa2a
Move translation service config to `config_for` yml (#30663) 2024-10-23 13:32:18 +00:00
David Roetzel 05f23df3b7
Add endpoint to remove web push subscription (#32626) 2024-10-23 08:02:31 +00:00
Matt Jankowski 40b4f73c18
Pre-import Rails 7.2 generated config minor changes (#30579) 2024-10-21 08:07:07 +00:00
Claire 6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while glitch-soc
  has a different version of the file overall.
  Added upstream's changes.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
 2024-10-19 19:13:32 +02:00
github-actions[bot] 8eae0d067d
New Crowdin Translations (automated) (#32573) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-18 07:56:43 +00:00
Claire 8b56509625
Add more explicit explanations about author attribution and `fediverse:creator` (#32383) 2024-10-17 09:03:08 +00:00
github-actions[bot] 009f2ebc32
New Crowdin Translations (automated) (#32553) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-17 08:21:51 +00:00
Claire 6ff1954bdb
Change Active Record Encryption variable check to check for emptiness (#32537) 2024-10-16 08:43:45 +00:00
github-actions[bot] acc1973f3a
New Crowdin Translations (automated) (#32533) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-16 08:12:43 +00:00
github-actions[bot] 7d89cea0ea
New Crowdin Translations (automated) (#32339) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-15 09:26:28 +00:00
Claire 4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
Claire ffa1032381
Add further warnings about encryption secrets (#32476) 2024-10-14 13:00:20 +00:00
Claire c574f5b53f
Change how migrations duplicated between glitch and upstream are handled (#2878) 2024-10-09 18:36:19 +02:00
Matt Jankowski 022c1ae6f2
Remove unused deprecator configuration (#32288) 2024-10-08 12:52:52 +00:00
github-actions[bot] ff3e2c9cfa
New Crowdin Translations (automated) (#32295) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-08 08:10:39 +00:00
Claire 7e06d724c9 Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream 2024-10-07 20:45:07 +02:00
Leni Kadali 4238da6ee3
Add error message when user tries to follow their own account (#31910) 2024-10-07 12:05:46 +00:00
github-actions[bot] 498024558a
New Crowdin Translations (automated) (#32262) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-07 07:06:43 +00:00
Claire b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
 2024-10-06 16:07:58 +02:00
gunchleoc 160917e718
Pluralize csv imports (#27094) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-04 08:19:01 +00:00
github-actions[bot] 1b247a1dc2
New Crowdin Translations (automated) (#32249) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-04 07:29:53 +00:00
github-actions[bot] fe3f5375e3
New Crowdin Translations (automated) (#32233) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-03 09:15:31 +00:00
Christian Schmidt 33d3ca7cf1
Support /.well-known/host-meta.json (#32206) 2024-10-02 09:23:44 +00:00
github-actions[bot] ea72d5ec3a
New Crowdin Translations (automated) (#32214) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-02 09:05:57 +00:00
Matt Jankowski df98cf71e3
Avoid repeated icon stack in settings sidebar (#32201) 2024-10-01 13:50:20 +00:00
Matt Jankowski 4b4bf82ea9
Fix nav item active highlight for some paths (#32159) 2024-10-01 10:48:27 +00:00
Matt Jankowski efd3f59627
Use `module: :users` in routes/admin section (#30767) 2024-10-01 10:02:58 +00:00
Emelia Smith 454d21ab5a
Remove OAuth Password Grant Type support (#30960) 2024-10-01 09:56:58 +00:00
Matt Jankowski 685067efd1
Avoid `id` duplication conflict with main navigation from settings profile link (#32181) 2024-10-01 08:23:05 +00:00
github-actions[bot] 5839ee434b
New Crowdin Translations (automated) (#32195) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-01 08:21:17 +00:00
Claire 9af9ef6fb3 Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream 2024-09-30 13:04:19 +02:00
Claire e22eff8900
Remove regexp timeout feature (#32169) 2024-09-30 09:41:06 +00:00
github-actions[bot] f477dc399e
New Crowdin Translations (automated) (#32140) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-30 08:53:29 +00:00
Claire 7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
github-actions[bot] c9b0699964
New Crowdin Translations (automated) (#32121) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-27 07:34:46 +00:00
Claire 513f187daf
Add “A Mastodon update is available.” message on admin dashboard for non-bugfix updates (#32106) 2024-09-26 19:27:57 +00:00
github-actions[bot] 278a075b22
New Crowdin Translations (automated) (#32103) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-26 08:47:38 +00:00
Christian Schmidt db332553c9
Rename "Data export" menu item (#32099) 2024-09-25 19:54:28 +00:00
Eugen Rochko 3426ea2912
Add preview of followers removed in domain block modal in web UI (#32032) 2024-09-25 18:13:36 +00:00
Claire 633165ba9c Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream 2024-09-25 17:41:37 +02:00
Renaud Chaput 28966fa0a6
Remove deprecated `v2_alpha` endpoint for grouped notifications (#32089) 2024-09-25 15:21:11 +00:00
github-actions[bot] 4e6fc3a62f
New Crowdin Translations (automated) (#32083) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-25 07:40:14 +00:00
Claire c6039f99ce Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream 2024-09-24 19:34:30 +02:00
David Roetzel cfb8fc6222
Increase regexp timeout and allow override (#32056) 2024-09-24 13:16:58 +00:00
github-actions[bot] 11ac5c8929
New Crowdin Translations (automated) (#32052) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-24 09:42:14 +00:00
Claire c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
Eugen Rochko aaab6b7adc
Add reblogs and favourites counts to statuses in ActivityPub (#32007) 2024-09-23 13:14:15 +00:00
Tim Campbell 11eae691ba
Feature more otel customization (#31998) 2024-09-23 08:55:35 +00:00
github-actions[bot] ed90d9342e
New Crowdin Translations (automated) (#32011) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-23 08:50:19 +00:00
Eugen Rochko 5fae1d55e5
Fix OAuth authorization prompt referring to third-party apps (#32005) 2024-09-23 08:42:03 +00:00
Claire 221bba1897 Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
github-actions[bot] 162f9a3c90
New Crowdin Translations (automated) (#31993) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-20 08:31:28 +00:00
github-actions[bot] efdc17513d
New Crowdin Translations (automated) (#31974) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-19 10:34:19 +00:00
Matt Jankowski 5405bdd344
Remove unused E2EE messaging code (#31193) 2024-09-18 09:27:43 +00:00
github-actions[bot] bd86c692cf
New Crowdin Translations (automated) (#31959) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-18 08:06:44 +00:00
Claire 665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.
 2024-09-16 21:08:58 +02:00
Claire e0648a916a
Rename `/api/v2_alpha/notifications*` to `/api/v2/notifications*` (#31840) 2024-09-16 12:10:02 +00:00
Claire d5cf27e667
Add global Regexp timeout (#31928) 2024-09-16 09:40:18 +00:00
github-actions[bot] 474abf3c7f
New Crowdin Translations (automated) (#31911) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-16 08:48:20 +00:00
Claire 117ac13d12 Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream 2024-09-13 21:37:34 +02:00
github-actions[bot] 353ade767b
New Crowdin Translations (automated) (#31898) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-13 08:41:46 +00:00
Claire 83b553c7d1 Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
Claire 3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream removed a helper, textually adjacent to a glitch-soc-only one.
  Not really a conflict.
  Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to theming system.
  Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
  Removed upstream, but we had local changes.
  Removed as upstream did.
 2024-09-12 20:05:08 +02:00
Claire caaa412e6e Merge commit 'f2a92c2d22345568ca7f47ee1d1d70de53eb547d' into glitch-soc/merge-upstream 2024-09-12 17:34:16 +02:00
Claire 90d7a4bac4 Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream 2024-09-12 17:22:06 +02:00
Claire a496aeabcb
Change form-action Content-Security-Policy directive to be more restrictive (#26897) 2024-09-12 13:24:19 +00:00
Eugen Rochko 24ef8255b3
Change design of embed modal in web UI (#31801) 2024-09-12 12:54:16 +00:00
Claire 10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
Eugen Rochko 3d46f47817
Change embedded posts to use web UI (#31766) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-12 09:41:19 +00:00
github-actions[bot] 7d53ca56d2
New Crowdin Translations (automated) (#31878) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-12 07:54:53 +00:00
Claire b240bad61a Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-soc/merge-upstream 2024-09-11 20:58:35 +02:00
github-actions[bot] 2babfafaff
New Crowdin Translations (automated) (#31855) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-11 08:18:10 +00:00
Eugen Rochko e0c27a5047
Add ability to manage which websites can credit you in link previews (#31819) 2024-09-10 12:00:40 +00:00
github-actions[bot] 5260233b81
New Crowdin Translations (automated) (#31835) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-10 09:22:49 +00:00
Claire 592a7af27f
Fix translatable source string using “silenced” instead of “limited” (#31822) 2024-09-09 19:57:52 +00:00
Claire 441af2632d Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream 2024-09-09 18:22:41 +02:00
github-actions[bot] 2caa3f365d
New Crowdin Translations (automated) (#31800) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-09 12:38:43 +00:00
Claire 5c97ccf939 Merge commit 'b716248fc5bde4dc47b8104d092d092d87c50f1a' into glitch-soc/merge-upstream 2024-09-06 20:10:53 +02:00
Claire 29124990a2 Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream reworked how CSS classes for the document's body are computed.
  Slight conflict due to glitch-soc's different theming system.
  Updated as upstream did.
 2024-09-06 19:25:31 +02:00
Claire b716248fc5
Add link to `/admin/roles` in moderation interface when changing someone's role (#31791) 2024-09-06 17:21:49 +00:00
Matt Jankowski b530fc5267
Update rails to version 7.1.4 (#31563) 2024-09-06 15:22:35 +00:00
Emelia Smith fd7fc7bdc3
Disable actions on reports that have already been taken (#31773) 2024-09-06 12:50:30 +00:00
github-actions[bot] cc4865193a
New Crowdin Translations (automated) (#31781) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-06 07:38:08 +00:00
Claire 1a0ef0c526 Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +02:00
github-actions[bot] eb23d9f0f6
New Crowdin Translations (automated) (#31765) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-05 09:40:38 +00:00
Claire 5a55180b95 Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream 
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
  glitch-soc had differences in the first few tests because of the wider
  subset of HTML it accepts.
  Changed `describe` to `RSpec.describe` as upstream did, keeping
  glitch-soc's tests.
 2024-09-04 19:38:52 +02:00
Claire ee55d20fd5
Allow `POST /oauth/revoke` through CORS (#31743) 2024-09-04 10:46:28 +00:00
github-actions[bot] 1c17dca6d9
New Crowdin Translations (automated) (#31741) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-04 08:42:36 +00:00
Claire fef055db96 Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
  Upstream refactored this file, while we had a change to switch a default setting.
  Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
  Upstream refactored this file, while we stubbed different methods.
  Updated as upstream did, and updated the stubs accordingly.
 2024-09-03 21:51:53 +02:00
Claire ea0d691e19
Add `GET /api/v2_alpha/notifications/:group_key/accounts` (#31725) 2024-09-03 14:32:26 +00:00
Claire ac4002fe08 Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-soc/merge-upstream 2024-09-03 12:12:23 +02:00
Matt Jankowski 4819fc72ee
Remove `config/secrets.yml` file (#31562) 2024-09-03 09:13:54 +00:00
github-actions[bot] e5155c50fd
New Crowdin Translations (automated) (#31716) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-03 08:02:08 +00:00
Claire 402c1e116d Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream 2024-09-02 17:43:10 +02:00
Christian Schmidt 491033c86c
Reject status creation with invalid `media_ids` parameter (#31681) 2024-09-02 15:30:48 +00:00
David Roetzel 388d5473e1
Refactor (ruby) redis configuration (#31694) 2024-09-02 14:19:55 +00:00
github-actions[bot] 2f2b98c8cb
New Crowdin Translations (automated) (#31671) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-02 08:35:09 +00:00
Claire 6f35e93f72 Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream 2024-08-31 16:06:04 +02:00
Matt Jankowski 85e8d1f285
Use rails configuration storage for paperclip path (#31651) 2024-08-30 09:46:09 +00:00
github-actions[bot] 92eba9096b
New Crowdin Translations (automated) (#31656) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-30 07:12:56 +00:00
github-actions[bot] 5d725b2c12
New Crowdin Translations (automated) (#31647) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-29 08:30:39 +00:00
github-actions[bot] 26d6d291c3
New Crowdin Translations (automated) (#31627) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-28 08:59:15 +00:00
Claire 94d8cdc494 Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream 2024-08-27 20:00:07 +02:00
github-actions[bot] 0e7c88aa6d
New Crowdin Translations (automated) (#31609) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-27 07:54:58 +00:00
Claire 11b8017b45 Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream 2024-08-26 18:52:33 +02:00
github-actions[bot] 626d44b6c6
New Crowdin Translations (automated) (#31572) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-26 07:25:39 +00:00
Claire d0529b810a Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream 2024-08-24 12:06:31 +02:00
github-actions[bot] 62be0234d5
New Crowdin Translations (automated) (#31559) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-23 08:59:31 +00:00
Matt Jankowski 6ec768668e
Remove `nsa` statsd integration (replaced by OpenTelemetry) (#30240) 2024-08-22 20:28:54 +00:00
Claire 18556d3e9b Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream refactored some helpers and moved them in another file.
  Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
  Kept glitch-soc definitions where they are and moved upstream ones
  as upstream did.
 2024-08-22 19:54:20 +02:00
Emelia Smith 376088f6da
Add button to view the Hashtag on the instance from Hashtags in Moderation UI (#31533) 2024-08-22 08:42:33 +00:00
github-actions[bot] f86d16adba
New Crowdin Translations (automated) (#31536) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-22 08:04:56 +00:00