monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,501 Commits 1 Branch 0 Tags 290 MiB
Commit Graph

4130 Commits

Author SHA1 Message Date
Claire 1cdd91d6f1 Merge commit '6b519cfefa93a923b19d0f20c292c7185f8fd5f5' into glitch-soc/merge-upstream 2025-02-27 15:52:20 +01:00
Claire 06f879ce9b
Merge commit from fork 
* Add rate-limit on `/auth/setup`

* Remove useless test
 2025-02-27 15:44:35 +01:00
github-actions[bot] cde3167d09
New Crowdin Translations (automated) (#34009) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-27 09:36:16 +00:00
Claire a682bd19f5 Merge commit '20531d1e078a27116dea53ce21c1b32bf3774eca' into glitch-soc/merge-upstream 2025-02-25 18:52:24 +01:00
github-actions[bot] 33643c4c07
New Crowdin Translations (automated) (#33996) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-25 13:08:40 +00:00
Eugen Rochko 298ca53593
Add choice of law to terms of service generator (#33994) 2025-02-25 10:58:11 +00:00
github-actions[bot] 5a3fb4594b
New Crowdin Translations (automated) (#33977) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-24 08:48:56 +00:00
Claire 524e8992ad Merge commit 'db971976853103017b1561f2c4f9406fa00c0a2e' into glitch-soc/merge-upstream 2025-02-22 21:31:46 +01:00
github-actions[bot] 2788808b07
New Crowdin Translations (automated) (#33967) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-21 07:41:14 +00:00
github-actions[bot] 70f8fb6d08
New Crowdin Translations (automated) (#33960) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-19 08:17:23 +00:00
Claire f3bc50778b Merge commit 'f1d4be1e7509f795706ff2310c5fc36e0e79bf4d' into glitch-soc/merge-upstream 2025-02-18 20:38:57 +01:00
Matt Jankowski f1d4be1e75
Use preferred allowed origin configuration style for webauthn config (#33953) 2025-02-18 15:03:43 +00:00
github-actions[bot] e2eceaf2fa
New Crowdin Translations (automated) (#33949) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-18 10:23:53 +00:00
github-actions[bot] a3ef72a541
New Crowdin Translations (automated) (#33933) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-17 09:22:13 +00:00
github-actions[bot] 5cd80b7836
New Crowdin Translations (automated) (#33925) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-14 08:38:48 +00:00
github-actions[bot] 58a029335b
New Crowdin Translations (automated) (#33918) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-13 10:50:09 +00:00
github-actions[bot] e0b7ecfb0b
New Crowdin Translations (automated) (#2933) 
* 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>
 2025-02-12 20:53:09 +01:00
Claire 28d85ede4c Merge commit '4fc8c6912979e8fd7882fb360b77e677ffd68565' into glitch-soc/merge-upstream 2025-02-12 18:40:21 +01:00
github-actions[bot] e918d4e3e8
New Crowdin Translations (automated) (#33899) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-12 08:33:41 +00:00
github-actions[bot] 804e6832d3
New Crowdin Translations (automated) (#33861) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-10 10:10:38 +00:00
Claire a417d6f3fc Merge commit '1cf30717dbe7a0038a645c62f19deef7efc42207' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/precompute_feed_service.rb`:
  Upstream added an option to skip half-generated timelines.
  We have a conflict because we still maintain upstream's old chronological DM
  timelines.
  Update our code to apply the same logic to the DM timelines.
 2025-02-07 21:21:28 +01:00
github-actions[bot] 9692ffb911
New Crowdin Translations (automated) (#33847) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-06 10:53:56 +00:00
Claire 6ab5b9c790 Merge commit 'a9643cb7e77fd345b48877ed958d406403ad1b46' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-push-pr.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-releases.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
- `.github/workflows/build-security.yml`:
  We had modified the file to disable the custom ARM64 builder.
  Upstream has removed it, using github's runners.
  Took upstream's changes.
 2025-02-05 18:21:36 +01:00
Renaud Chaput 4af91e564d
Fix a missing `require` when enabling the local prometheus exporter with Sidekiq (#33840) 2025-02-05 13:49:47 +00:00
github-actions[bot] 7dca242795
New Crowdin Translations (automated) (#33835) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-05 08:53:32 +00:00
Claire 1dbeac2196 Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream 2025-02-04 18:38:41 +01:00
Matt Jankowski 745391092c
Configure webpacker `cache_manifest: true` in non-dev environments (#33832) 2025-02-04 15:55:10 +00:00
github-actions[bot] c3e80784ee
New Crowdin Translations (automated) (#33825) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-04 09:39:07 +00:00
github-actions[bot] a85a9f98d9
New Crowdin Translations (automated) (#33802) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-02-03 08:40:09 +00:00
Claire c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
- `app/models/user_settings.rb`:
  Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
  setting added upstream.
  Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
  Same.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.
 2025-02-01 19:07:13 +01:00
github-actions[bot] 91e4a09f24
New Crowdin Translations (automated) (#33795) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-31 08:09:02 +00:00
github-actions[bot] 3f4f6317d4
New Crowdin Translations (automated) (#33787) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-30 08:52:04 +00:00
Eugen Rochko 1e70da5e3c
Add reminder when about to post without alt text in web UI (#33760) 2025-01-29 11:37:56 +00:00
Claire 844ae90dad Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream 2025-01-29 12:05:09 +01:00
github-actions[bot] 9c85825ac6
New Crowdin Translations (automated) (#33766) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-29 08:38:53 +00:00
Claire 353e5f797c Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
 2025-01-28 18:29:46 +01:00
github-actions[bot] 80f72ee501
New Crowdin Translations (automated) (#33753) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-28 09:40:50 +00:00
Claire fcc5262f60 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream 
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
  Upstream tests for changing themes in there, but glitch-soc has
  its own place for that.
  Updated upstream's change while skipping the theme test.
 2025-01-27 18:19:09 +01:00
Renaud Chaput 59384282ed
Add an optional metric exporter (#33734) 2025-01-27 12:52:30 +00:00
github-actions[bot] b53bf23df0
New Crowdin Translations (automated) (#33731) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-27 08:39:56 +00:00
github-actions[bot] e44b78413a
New Crowdin Translations (automated) (#33711) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-24 09:06:25 +00:00
Claire 4b4de02fee
Remove broken link to Terms of Service when none are defined (#33699) 2025-01-23 14:34:30 +00:00
Claire ffaf458f99
Change “Prohibited uses” section of ToS template according to feedback (#33703) 2025-01-23 14:09:33 +00:00
github-actions[bot] 1b2c952471
New Crowdin Translations (automated) (#33697) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-23 13:36:03 +00:00
Claire 19fa4cfcf2 Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream 2025-01-23 13:38:23 +01:00
github-actions[bot] 38c27a7708
New Crowdin Translations (automated) (#33679) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-22 08:35:41 +00:00
Claire 05e5db91c7 Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict because one of the removed lines was modified to accomodate for
  glitch-soc's slightly different build system.
  Removed the lines as upstream did.
 2025-01-21 19:23:25 +01:00
Eugen Rochko 11786f1114
Change design of edit media modal in web UI (#33516) 2025-01-21 11:34:22 +00:00
Claire ce7fb94306 Merge commit '4ebdfed8ea7d16d203da73051ef26bbcdeb63681' into glitch-soc/merge-upstream 2025-01-21 12:06:49 +01:00
github-actions[bot] 9e90248abc
New Crowdin Translations (automated) (#33668) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-21 08:37:53 +00:00