1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-12 05:39:02 +09:00
Commit Graph

14 Commits

Author SHA1 Message Date
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
Claire
07cd1fd1ef
Support translation branches in Crowdin (#32174) 2024-09-30 17:32:23 +00:00
Claire
5f8f8cc98f
Fix crowdin upload workflow not running on glitch-soc (#2830) 2024-08-31 17:33:06 +02:00
Claire
169b35869f Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream 2024-08-14 21:17:43 +02:00
renovate[bot]
6bd7da72e9
Update crowdin/github-action action to v2 (#31380)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-13 22:28:13 +00:00
Claire
1f796d129d Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream
Conflicts:
- `config/routes/api.rb`:
  Upstream added an endpoint, textually close to a glitch-soc-only endpoint.
  Ported upstream changes.
2024-07-30 20:47:34 +02:00
Matt Jankowski
7e33583daa
Dont run crowdin upload workflow on forks (#31195) 2024-07-29 17:19:05 +00:00
Claire
6a55232988 Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00
Matt Jankowski
1d35626dc7
Limit CI push triggers to main and stable-* branches (#30934) 2024-07-07 09:39:31 +00:00
Claire
82fcb55680 Fix crowdin upload workflow not triggering on glitch-soc source string changes 2024-06-08 13:49:02 +02:00
Claire
e193c848fe Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
2023-09-15 21:25:05 +02:00
renovate[bot]
3d0331fc7a
Update actions/checkout action to v4 (#26882)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 10:41:26 +02:00
Claire
949f1fc343
Fix Crowdin Github Action (#2311) 2023-07-19 08:36:25 +02:00
Renaud Chaput
626a7b6a77
Add a Github Action to send translations to Crowdin for each merge in main (#25869) 2023-07-18 16:56:01 +02:00