mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,849 Commits
69 Branches
21 Tags
341 MiB
Commit Graph

3681 Commits (6b4c182806b141d432f4e25a194e15aacb421128)

Author SHA1 Message Date
Claire 64300e0fe3
Fix self-destruct schedule not actually replacing initial schedule (#29049) 2024-02-06 15:32:09 +00:00
Matt Jankowski ce0d134147
Add `redirect_with_vary` to `AllowedMethods` for `Style/FormatStringToken` cop (#28973) 2024-01-30 15:39:01 +00:00
Claire 5fa2821853 Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
github-actions[bot] ae9c675930
New Crowdin Translations (automated) (#2564) 
* New Crowdin translations

* Fix bogus translation files

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-26 19:45:04 +01:00
github-actions[bot] 45287049ab
New Crowdin Translations (automated) (#28923) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-26 09:15:55 +00:00
Claire 70de52c297 Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream 2024-01-25 19:51:19 +01:00
Matt Jankowski c8f59d2ca4
Fix `Style/TernaryParentheses` cop (#28387) 2024-01-25 13:28:49 +00:00
github-actions[bot] 59d2ea0d82
New Crowdin Translations (automated) (#28899) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-25 13:00:44 +00:00
Claire 22cfab0ebf Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  Upstream made style fixes, while glitch-soc had extra options.
  Ported upstream's style fixes.
 2024-01-24 20:42:53 +01:00
Eugen Rochko b19ae521b7
Add confirmation when redirecting logged-out requests to permalink (#27792) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-24 10:49:19 +00:00
github-actions[bot] a34d27c18f
New Crowdin Translations (automated) (#28875) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-24 10:06:56 +00:00
Eugen Rochko 5b1eb09d54
Add annual reports for accounts (#28693) 2024-01-24 09:38:10 +00:00
github-actions[bot] 78ee1453f9
New Crowdin Translations (automated) (#28857) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-23 10:11:37 +00:00
Claire 102eff7c05 Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream 2024-01-22 19:19:40 +01:00
Claire e2d9635074
Add notification email on invalid second authenticator (#28822) 2024-01-22 13:55:43 +00:00
github-actions[bot] 76e383ea1e
New Crowdin Translations (automated) (#28827) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-22 11:52:26 +00:00
Claire 3593ee2e36
Add rate-limit of TOTP authentication attempts at controller level (#28801) 2024-01-19 12:19:49 +00:00
Matt Jankowski 5fc4ae7c5f
Move privacy policy into markdown file (#28699) 2024-01-19 11:22:23 +00:00
github-actions[bot] 9cd17020bc
New Crowdin Translations (automated) (#28798) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-19 09:41:57 +00:00
Claire c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to glitch-soc's option to hide followers count.
  Ported upstream changes.

Additional changes:
- `app/views/application/mailer/_account.html.haml`:
  Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
  Ported the `frontend_asset_url` helper change to glitch-soc.
 2024-01-17 18:32:15 +01:00
github-actions[bot] 1ab42ad12b
New Crowdin Translations (automated) (#28749) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-17 14:23:14 +00:00
Matt Jankowski c523a9601b
Rename local webpack* var in development env CSP config (#28766) 2024-01-17 09:22:16 +00:00
Matt Jankowski 0ce081fe49
Remove monkey patch in favor of supported Devise config value (#28760) 2024-01-17 09:08:17 +00:00
Claire e4d07c7bcc Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream 2024-01-16 12:04:11 +01:00
Renaud Chaput 01b6c83c36
Add a new `@/` alias for the root frontend directory and use it where possible (#28753) 2024-01-16 10:27:26 +00:00
Claire 01df34b9db Remove bypass and use use glitch-soc's theming system for inert.css 2024-01-15 22:16:26 +01:00
Claire 34c9f77b3e Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Used glitch-soc's path for the mailer pack.
 2024-01-15 21:30:00 +01:00
Claire 2f521bc84a Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream 2024-01-15 20:27:41 +01:00
Claire 464051c2d2 Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream 2024-01-15 20:06:31 +01:00
Claire 60298af3c4 Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how the `inert.css` file is included.
  The conflict is caused by glitch-soc's theming system.
  Ported the upstream change.

Additional changes:
- `config/webpack/shared.js`: bypass glitch-soc's theming
  system for `inert` pack.
 2024-01-15 20:01:36 +01:00
Claire 1323dfac80 Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream 2024-01-15 19:19:04 +01:00
HTeuMeuLeu 7f471e70c0
Update new email templates (#28416) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
 2024-01-15 18:18:59 +00:00
github-actions[bot] 1012ffac9e
New Crowdin Translations (automated) (#28721) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-15 11:06:25 +00:00
Claire 6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064) 2024-01-12 20:16:48 +00:00
Renaud Chaput 608f66f978
Change icon SVG imports to use a default import (#28709) 2024-01-12 10:31:24 +00:00
github-actions[bot] b86083f0dc
New Crowdin Translations (automated) (#28708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-12 09:17:10 +00:00
Claire 630b245bb4 Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
  Removed upstream, while glitch-soc had a change related to its theming system.
  Removed as well, as it's unused.
 2024-01-11 12:59:27 +01:00
Claire 47d213e701 Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream 2024-01-10 18:41:04 +01:00
Claire 51d2d98174 Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream 2024-01-10 18:26:47 +01:00
Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
 2024-01-10 17:51:12 +01:00
Matt Jankowski 4e02838832
Enable "low risk" Rails 7.1 setting defaults (#28626) 2024-01-09 12:50:57 +00:00
github-actions[bot] 01ca84e541
New Crowdin Translations (automated) (#28660) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-09 11:48:19 +00:00
gunchleoc 173953c23e
Fix ISO code for Canadian French (#26015) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-01-09 10:56:13 +00:00
github-actions[bot] 8e7d5fe2ac
New Crowdin Translations (automated) (#28658) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-09 09:30:33 +00:00
github-actions[bot] cc67943df2
New Crowdin Translations (automated) (#28627) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-08 12:46:25 +00:00
Renaud Chaput a0e237a96f
Upgrade Redux packages (#28585) 2024-01-08 10:57:40 +00:00
Matt Jankowski e09419f22a
Move old framework defaults file to regular config value (#28623) 2024-01-08 10:17:38 +00:00
Matt Jankowski a27a82939d
Remove the 7.1 marshalling format "todo" from new_framework_defaults (#28625) 2024-01-08 10:16:33 +00:00
Jean Boussier 5a6d533c53
Enable Rails 7.1 Marshalling format (#28609) 2024-01-05 21:57:47 +00:00
github-actions[bot] 43d800ada6
New Crowdin Translations (automated) (#28604) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-05 11:29:19 +00:00
github-actions[bot] bdf4750633
New Crowdin Translations (automated) (#28590) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-04 09:24:13 +00:00
Claire dfdadb92e8
Add ability to require approval when users sign up using specific email domains (#28468) 2024-01-04 09:07:05 +00:00
Claire 9d9008666b Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream 2024-01-03 12:38:49 +01:00
Claire bd415af9a1
Change streaming API host to not be overridden to localhost in development mode (#28557) 2024-01-03 10:23:58 +00:00
github-actions[bot] 7cce2a41f2
New Crowdin Translations (automated) (#28573) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-03 09:19:46 +00:00
Claire b3542ac57b Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our README.
 2024-01-02 13:35:11 +01:00
github-actions[bot] 0374e11091
New Crowdin Translations (automated) (#28529) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-01-02 09:11:53 +00:00
Claire 35b6583371 Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream 2023-12-29 17:40:57 +01:00
github-actions[bot] 7df9c4f6f3
New Crowdin Translations (automated) (#28481) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-29 10:39:10 +00:00
Claire c5b0e6d5a0 Merge branch 'main' into glitch-soc/merge-upstream 2023-12-28 16:57:10 +01:00
Claire 19e14654cc
Reduce CSP configuration changes with upstream (#2536) 2023-12-27 09:54:05 +01:00
github-actions[bot] e70a65761a
New Crowdin Translations (automated) (#28467) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-22 07:58:20 +00:00
Claire 92aa6e2ec9 Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream 2023-12-21 19:42:13 +01:00
Claire 30ee7339d3 Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream changed code style change, including on a line modified by glitch-soc.
  Kept glitch-soc's line but with the code style change applied.
 2023-12-21 19:31:12 +01:00
Claire f5b7307890 Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines.
 2023-12-21 19:24:10 +01:00
Claire a60b9acf3c Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream 2023-12-21 19:04:20 +01:00
Claire 6e56f95285 Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream modified its README, we have a completely different one.
  Kept our README file.
 2023-12-21 18:17:17 +01:00
github-actions[bot] 9e5ddc1745
New Crowdin Translations (automated) (#28451) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-21 09:09:00 +00:00
Claire b2961dad2b Fix lint issue in glitch-soc-only file 2023-12-20 22:25:23 +01:00
Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Conflict caused by the `json` gem thing once again.
  Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored a bunch of specs, including one place that differs
  because of glitch-soc's theming system.
  Refactored as upstream did, adapting it for glitch-soc's theming system.
 2023-12-20 22:16:50 +01:00
Claire 8a5f2442cc Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream 2023-12-20 21:58:18 +01:00
Claire b8209c3b96 Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
  Upstream reworked the CSP, we kept our version for now.
 2023-12-20 20:10:45 +01:00
Claire ac04e62a0e
Remove unused route definitions (#28430) 2023-12-20 09:44:01 +00:00
github-actions[bot] fecc07856c
New Crowdin Translations (automated) (#28439) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-20 09:15:30 +00:00
Claire b135b6ba8f Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Conflict caused by glitch-soc having a different file size limit constant
  name.
  Updated like upstream did while keeping glitch-soc's constant name.
 2023-12-19 21:24:01 +01:00
Claire 6c00d5b0c4 Fix test failure caused by glitch-soc changes 2023-12-19 21:14:39 +01:00
Claire 2e786e13cb Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/status_pin_validator.rb`:
  Upstream refactored that file, while glitch-soc had configurable limits for
  pinned statuses.
  Updated the code with upstream's refactor, while keeping glitch-soc's
  configurability.
 2023-12-19 20:51:37 +01:00
Claire d288a6162a Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream 2023-12-19 20:40:05 +01:00
Claire b24f676cf1 Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream 2023-12-19 20:24:57 +01:00
Claire 3ad92e8d0d Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream 2023-12-19 20:17:23 +01:00
github-actions[bot] fa987db738
New Crowdin Translations (automated) (#28423) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-19 09:40:37 +00:00
Claire a111fd7a0b Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream 2023-12-18 20:47:27 +01:00
Claire d6ad9d351e Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream 2023-12-18 19:10:43 +01:00
Claire b474cbbd28 Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
  We differed by listing suspended users when requesting relationships.
  Updated to upstream's code.
 2023-12-18 18:40:58 +01:00
Claire 46ddaffd40 Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream 2023-12-18 18:34:25 +01:00
Claire cd2ee0ec5f Merge commit '757d7c73c0ca3750ac9e74a7e962f71c535a7bd0' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept ours.
- `yarn.lock`:
  Upstream changed from yarn 1 to yarn 4, but we had some different
  dependencies.
  Updated to yarn 4 and re-added our dependencies.
 2023-12-18 18:25:33 +01:00
Claire bc33be0342 Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
  Kept our version of `json-ld` while updating other dependencies.
 2023-12-18 18:07:24 +01:00
Matt Jankowski 89d468ada7
Fix `Style/StderrPuts` cop (#28389) 2023-12-18 09:36:08 +00:00
Matt Jankowski e56fb9e489
Fix `Style/SymbolProc` cop (#28386) 2023-12-18 09:32:02 +00:00
github-actions[bot] f99e05710e
New Crowdin Translations (automated) (#28373) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-18 08:25:21 +00:00
Claire 33dd5d8179 Fix Ruby lint issues 2023-12-17 23:17:55 +01:00
Claire 4113fbf6e8 Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules.
 2023-12-17 23:04:16 +01:00
Claire ddf3ad9541 Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main 
Conflicts:
- `package.json`:
  Upstream removed a dependency textually close to a glitch-only dependency.
  Updated as upstream while keeping our dependency.
 2023-12-17 17:43:30 +01:00
Claire 1474318691 Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream fixed a bug in the trending post condition.
  Glitch-soc's condition is different because we potentially allow CWed content
  to trend.
  Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
  Kept our version for now, we will switch to upstream later down the road.
 2023-12-17 15:32:29 +01:00
Matt Jankowski e5717c9bc6
Fix `Style/Lambda` cop (#28378) 2023-12-15 14:34:24 +00:00
Matt Jankowski 1ee8d1e50e
Assign a proc to `Rack::Request.ip_filter` instead of patching method (#28380) 2023-12-15 14:33:56 +00:00
github-actions[bot] b2f915b31a
New Crowdin Translations (automated) (#28344) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-13 09:52:37 +00:00
Claire f37c93f3d7
Change cookie rotator to use SHA1 digest for new cookies (#27392) 2023-12-12 12:01:08 +00:00
Claire 393e851649
Change Rails' cache format to 7.0 (#27393) 2023-12-12 12:00:23 +00:00
github-actions[bot] 14e64bc880
New Crowdin Translations (automated) (#28334) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-12 11:45:10 +00:00
github-actions[bot] 79a81da69c
New Crowdin Translations (automated) (#28291) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-11 08:22:52 +00:00
Claire 9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`
 2023-12-10 18:05:02 +01:00
github-actions[bot] ca1b7efb06
New Crowdin Translations (automated) (#28275) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-08 09:52:32 +00:00
github-actions[bot] e0dacf6b4c
New Crowdin Translations (automated) (#28264) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-07 09:38:44 +00:00
Matt Jankowski 42afd30324
Replace Sprockets with Propshaft (#28239) 2023-12-06 10:19:24 +00:00
github-actions[bot] 954169966b
New Crowdin Translations (automated) (#28245) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-12-06 08:52:55 +00:00
github-actions[bot] 4238ec844d
New Crowdin Translations (automated) (#28120) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-05 16:07:53 +00:00
Claire 046141d2a4
Fix i18n unused check being tripped by `no` in YAML files (#2496) 2023-12-03 11:21:34 +01:00
Matt Jankowski 5631f139c1
Fix `Lint/SymbolConversion` cop (#28175) 2023-12-01 15:53:35 +00:00
Matt Jankowski a8473f582d
Add zeitwerk inflector for cli->CLI (#27635) 2023-11-30 13:55:20 +00:00
Claire 85662a5a57
Change `img-src` and `media-src` CSP directives to not include `https:` (#28025) 2023-11-30 13:47:01 +00:00
Matt Jankowski a1636fce7f
Move lib/devise/* to lib/devise/strategies/* (#27638) 2023-11-29 10:10:21 +00:00
Matt Jankowski 31bef99b9e
Move lib/mastodon/premailer_webpack_strategy to lib/ (#27636) 2023-11-29 10:08:55 +00:00
github-actions[bot] af02484714
New Crowdin Translations (automated) (#28096) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-28 08:59:48 +00:00
github-actions[bot] fad9343bab
New Crowdin Translations (automated) (#28069) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-27 10:06:35 +00:00
Claire 660372d130
Revert recent CSP changes (#2485) 
* Revert "Fix image and media loading when using external storage server"

This reverts commit 6cfa0245ca.

* Revert "Change glitch-soc's CSP config to match upstream's closer (#2474)"

This reverts commit d59196e170.
 2023-11-26 15:32:35 +01:00
github-actions[bot] 8521238677
New Crowdin Translations (automated) (#28060) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-24 10:25:39 +00:00
github-actions[bot] c810b197ad
New Crowdin Translations (automated) (#28050) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-23 09:34:50 +00:00
github-actions[bot] d3ed03fd6b
New Crowdin Translations (automated) (#28036) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-22 15:48:12 +00:00
Claire 6cfa0245ca Fix image and media loading when using external storage server 
Fixes #2479
 2023-11-21 13:45:29 +01:00
Matt Jankowski 6d51ac246b
Update partials for the `AdminMailer.new_trends` mailer (#28011) 2023-11-21 10:52:20 +00:00
github-actions[bot] 3c3e0c25ef
New Crowdin Translations (automated) (#28015) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-21 10:35:02 +00:00
Claire d59196e170
Change glitch-soc's CSP config to match upstream's closer (#2474) 2023-11-20 13:02:49 +01:00
github-actions[bot] 8ceae2bce6
New Crowdin Translations (automated) (#27966) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-20 08:47:34 +00:00
github-actions[bot] 9c68741f46
New Crowdin Translations (automated) (#27914) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-17 09:16:12 +00:00
github-actions[bot] 7232d4750d
New Crowdin Translations (automated) (#27884) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-16 10:08:22 +00:00
Claire bd575a1dd6
Add banner for forwarded reports made by remote users about remote content (#27549) 2023-11-15 14:18:43 +00:00
Eugen Rochko d67bd44ca1
Add profile setup to onboarding in web UI (#27829) 2023-11-15 11:13:53 +00:00
github-actions[bot] d8074128f9
New Crowdin Translations (automated) (#27866) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-15 09:41:24 +00:00
github-actions[bot] c1e071f634
New Crowdin Translations (automated) (#27848) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-14 10:53:47 +00:00
Eugen Rochko 7e3c10dec6
Add icons for private and disabled boost in web UI (#27817) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-11-13 14:39:45 +00:00
Claire 07a4059901
Add support for invite codes in the registration API (#27805) 2023-11-13 13:27:00 +00:00
github-actions[bot] e5a7b73ef4
New Crowdin Translations (automated) (#27815) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-13 13:21:02 +00:00
GitHub Actions 46a28fc41f New Crowdin translations 2023-11-11 04:27:29 +00:00
github-actions[bot] ac62b995ef
New Crowdin Translations (automated) (#27804) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-10 13:07:04 +00:00
Matt Jankowski 9429e30d75
Disable sidekiq unique jobs in test env (#27737) 2023-11-09 16:19:04 +00:00
Claire c451bbe249
Allow viewing and severing relationships with suspended accounts (#27667) 2023-11-09 14:50:25 +00:00
github-actions[bot] d6c971e158
New Crowdin Translations (automated) (#27787) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-09 09:54:14 +00:00
Matt Jankowski c875dfc90b
Fix `Lint/UnusedBlockArgument` cop (#27777) 2023-11-09 09:43:26 +00:00
Jaehong Kang c73d5a6075
Using Sidekiq concurrency for default db pool value (#26488) 2023-11-08 13:15:43 +00:00
github-actions[bot] 5c328ae674
New Crowdin Translations (automated) (#27768) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-08 12:40:09 +00:00
Matt Jankowski 33cc3ae8fa
Fix `Style/StabbyLambdaParentheses` cop (#27771) 2023-11-08 12:01:18 +00:00
Renaud Chaput 757d7c73c0
Upgrade to Yarn 4, remove support for Node 16 (#27073) 2023-11-08 10:57:21 +00:00
Claire 23e32a4b30
Fix format-dependent redirects being cached regardless of requested format (#27632) 2023-11-08 10:31:05 +00:00
Matt Jankowski 02d27de5ce
Move i18n locale configuration to separate initializer (#27571) 2023-11-07 15:22:14 +00:00
Matt Jankowski bbad5b6456
Remove false positive cop detection (#27457) 2023-11-07 10:44:15 +00:00
github-actions[bot] 1b28ab7263
New Crowdin Translations (automated) (#27687) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-07 09:03:59 +00:00
Matt Jankowski d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops (#27730) 2023-11-06 16:25:40 +00:00
github-actions[bot] 2d548e273e
New Crowdin Translations (automated) (#27646) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-03 10:10:13 +00:00
Matt Jankowski 7ef56d6e50
Move json_ld context loaders to `config/initializers` (#27590) 2023-10-31 15:21:23 +00:00
Matt Jankowski 3107a9410c
Silence deprecation warning about secrets/credentials with Devise patch (#27578) 2023-10-31 11:10:15 +00:00
Renaud Chaput 0e3401bc1c
Improve Babel configuration and automatically load polyfills (#27333) 2023-10-31 10:55:13 +00:00
github-actions[bot] e5b7ae9576
New Crowdin Translations (automated) (#27630) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-31 08:43:17 +00:00
github-actions[bot] a918208ec6
New Crowdin Translations (automated) (#27596) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-30 14:19:25 +00:00
Matt Jankowski eae5c7334a
Extract class from CSP configuration/initialization (#26905) 2023-10-27 16:20:40 +00:00
Matt Jankowski 1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec (#27486) 2023-10-27 09:57:16 +00:00
github-actions[bot] 8ca16f032e
New Crowdin Translations (automated) (#27583) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-27 09:38:04 +00:00
Claire bbf46cc418
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts (#27459) 2023-10-27 08:35:21 +00:00
Matt Jankowski 12550a6a28
Use `Rails.env.local?` shorthand method to check env (#27519) 2023-10-26 21:20:41 +00:00
Matt Jankowski 4aa05d45fc
Capture minimum postgres version 12 (#27528) 2023-10-26 20:35:15 +00:00
github-actions[bot] 3427b51d63
New Crowdin Translations (automated) (#27567) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-26 11:05:47 +00:00
Claire 49b8433c56
Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368) 2023-10-25 21:33:44 +00:00
Claire 62620956d5 Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream 2023-10-25 19:59:17 +02:00
Matt Jankowski 9a3d047f3e
Run `bin/rails app:update` with Rails 7.1 (#27522) 2023-10-25 13:56:09 +00:00
Claire 6e9f89e5b6 Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream fixed `@rails/ujs` imports.
  Already taken care of in 8a131fb7bc
- `app/javascript/packs/public.jsx`:
  Upstream fixed `@rails/ujs` imports.
  Already taken care of in 8a131fb7bc
 2023-10-25 12:18:45 +02:00
Claire ba527c071f Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream changed how icons are handled, including on a line modified by
  glitch-soc to bump the number of poll options.
  Applied upstream's change, while keeping the increased number of poll
  options.
 2023-10-25 12:14:24 +02:00
github-actions[bot] c85e0a6b04
New Crowdin Translations (automated) (#27544) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-25 07:36:07 +00:00
Claire 4ef66d6538 Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  glitch-soc had extra ignores.
  Removed them.
 2023-10-24 20:31:20 +02:00
Claire 3c9c0299c0 Fix ActiveRecord::Migrator monkey-patch 2023-10-24 20:23:46 +02:00
Claire 4b0fb764c3 Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream 
Conflicts and ported changes:
- updated `@rails/ujs` imports
 2023-10-24 19:59:19 +02:00
Eugen Rochko 134de736dc
Change icons in web UI (#27385) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-10-24 17:45:08 +00:00
Claire e25cc4deb7 Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes.
 2023-10-24 19:31:14 +02:00
Claire 57c0de949b Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream changed how asset host CSP directives are used, and glitch-soc has
  a pretty different CSP file.
  It may be worth reconsidering the differences between upstream and glitch-soc
  but for now, just port the change.
 2023-10-24 19:17:20 +02:00
Claire b0c76eaadd Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change.
 2023-10-24 18:41:20 +02:00
github-actions[bot] 50b7ea810e
New Crowdin Translations (automated) (#27523) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-24 09:51:34 +00:00
Matt Jankowski e93a75f1a1
Rails 7.1 update (#25963) 2023-10-23 17:58:29 +00:00
Claire 379115e601
Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439) 2023-10-23 15:46:21 +00:00
Claire 99f2534cee
Add support for displaying unknown servers on /admin/instances/:domain (#27150) 2023-10-23 14:27:57 +02:00
Claire c3e0eb3699
Change Content-Security-Policy to be tighter on media paths (#26889) 2023-10-23 14:27:07 +02:00
github-actions[bot] 70fd819935
New Crowdin Translations (automated) (#27490) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-23 10:04:54 +02:00
Matt Jankowski ab0fb81479
Configure brakeman to ignore url safe preview card urls (#25883) 2023-10-20 15:32:16 +02:00
github-actions[bot] 284c719f64
New Crowdin Translations (automated) (#27480) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-20 10:11:40 +02:00
Claire 74fd46d3ab Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream 2023-10-19 19:14:04 +02:00
Matt Jankowski 9f218c9924
Refactor appeal partial to avoid brakeman XSS warning (#25880) 2023-10-19 17:25:54 +02:00
Matt Jankowski bcd0171e5e
Fix `Lint/UselessAssignment` cop (#27472) 2023-10-19 16:55:06 +02:00
github-actions[bot] 1ffd5a98a9
New Crowdin Translations (automated) (#27465) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-19 14:31:25 +02:00
github-actions[bot] 4612576c68
New Crowdin Translations (automated) (#27454) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-18 11:08:10 +02:00
Claire 63179f0bf4 Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream 2023-10-17 21:59:58 +02:00
Claire b867d4581e Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
  Glitch-soc had a few extra lines in this file to account for a different
  default setting. This file got replaced by
  `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
  additions were moved too.

Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
  Add glitch-soc-only attribute `content_type`.
 2023-10-17 21:35:07 +02:00
Claire 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system.
 2023-10-17 20:59:18 +02:00
Matt Jankowski 65cd0700e4
Refactor domains cli to remove model call from regex (#25878) 2023-10-17 15:58:42 +02:00
Wladimir Palant 23f8e93c64
Fixes #23135 - Allow cross origin request for /nodeinfo/2.0 API (#27413) 2023-10-16 13:39:25 +02:00
github-actions[bot] 13456efd7b
New Crowdin Translations (automated) (#27410) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-16 11:31:52 +02:00
Renaud Chaput e0da64bb4e
Fix empty ENV variables not using default nil value (#27400) 2023-10-13 19:00:53 +02:00
github-actions[bot] 773d25e8df
New Crowdin Translations (automated) (#27388) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-13 11:01:40 +02:00
github-actions[bot] c348b904a5
New Crowdin Translations (automated) (#27376) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-12 10:07:40 +02:00
github-actions[bot] f1ae72ba46
New Crowdin Translations (automated) (#27364) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-11 16:37:01 +02:00
Claire 3735e6f79d Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream 2023-10-10 19:53:41 +02:00
github-actions[bot] 1a2a4c389f
New Crowdin Translations (automated) (#27347) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 10:06:37 +02:00
Claire 3da7afdeed Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream 2023-10-09 21:10:47 +02:00
github-actions[bot] 89b48681cf
New Crowdin Translations (automated) (#27321) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-09 10:32:06 +02:00
Claire 53f5b27bd1 Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream 2023-10-08 17:30:48 +02:00
Claire 86c9c5afa0 Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Upstream changed the order of Action Controller filters for web app
  controllers.
  Glitch-soc has an extra filter due to its theming system.
  Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to an extra newline in glitch-soc.
  Removed that newline and applied upstream's changes.
 2023-10-08 17:26:43 +02:00
Claire ac2370778a Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream 
Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.
 2023-10-08 17:21:12 +02:00
Claire e9a181c52c Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream 2023-10-08 16:53:05 +02:00
Claire 702d162998 Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
 2023-10-08 16:48:19 +02:00
Claire d7fcd70023 Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/cors.rb`:
  Upstream refactored this file, and glitch-soc had local changes.
  I could not find the rationale for the glitch-soc changes, so I
  used upstream's version.
 2023-10-08 16:41:56 +02:00
Claire 19ebf7797e Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream 2023-10-08 16:30:00 +02:00
github-actions[bot] e0b54ed3e1
New Crowdin Translations (automated) (#27304) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-06 11:49:09 +02:00
github-actions[bot] 32ab474472
New Crowdin Translations (automated) (#27277) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-05 13:13:14 +02:00
github-actions[bot] 8e4251f9e7
New Crowdin Translations (automated) (#27270) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-04 10:53:04 +02:00
Nick Schonning 85db392464
Autofix Rubocop cops for config/ (#24145) 2023-10-03 15:24:12 +02:00
github-actions[bot] e95d25e101
New Crowdin Translations (automated) (#27260) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-03 10:47:28 +02:00
github-actions[bot] ee866ec0e0
New Crowdin Translations (automated) (#27220) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-02 13:35:29 +02:00
github-actions[bot] 695e42de0d
New Crowdin Translations (automated) (#27202) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-29 10:04:18 +02:00
Matt Jankowski 56c0babc0b
Fix rubocop `Layout/ArgumentAlignment` cop (#26060) 2023-09-28 15:48:47 +02:00
github-actions[bot] b93ce7d8b3
New Crowdin Translations (automated) (#27168) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-28 10:44:16 +02:00
Georg Gadinger ebd2017524
fix Content-Security-Policy when using Azure storage (#2427) 2023-09-26 20:09:56 +02:00
Claire abdb58840a Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream 2023-09-26 13:13:27 +02:00
github-actions[bot] 5ea3e8e765
New Crowdin Translations (automated) (#27144) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-26 10:47:16 +02:00
github-actions[bot] 736fe75346
New Crowdin Translations (automated) (#27080) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-25 10:50:09 +02:00
github-actions[bot] e824585523
New Crowdin Translations (automated) (#27052) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-22 11:06:48 +02:00
Claire f05985f8ec Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
 2023-09-21 15:12:00 +02:00
Claire 8acc75435b
Change S3 checksum mode to be disabled by default (#27007) 2023-09-21 14:00:51 +02:00
github-actions[bot] effe4728cf
New Crowdin Translations (automated) (#27005) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-21 11:06:04 +02:00
github-actions[bot] 61fe25fe74
New Crowdin Translations (automated) (#26988) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-20 13:05:56 +02:00
Claire f546b0c999 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-19 17:07:29 +02:00
github-actions[bot] 73ecc4de6e
New Crowdin Translations (automated) (#26978) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-19 16:26:51 +02:00
Claire 1e87575b70 Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream 2023-09-19 12:53:32 +02:00
github-actions[bot] 67eaaa4b90
New Crowdin Translations (automated) (#26966) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-19 10:41:48 +02:00
github-actions[bot] 1b4902fabf
New Crowdin Translations (automated) (#26913) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-18 13:46:07 +02:00
Claire 5ed72f668f Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream 2023-09-15 21:39:21 +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
Claire 08b495d95c Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream 2023-09-15 21:06:45 +02:00
Claire 5d8c65f2a7 Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream 2023-09-15 20:57:40 +02:00
Claire a04ae16201
Fix CSP when using `ONE_CLICK_SSO_LOGIN` (#26901) 2023-09-13 19:54:04 +02:00
github-actions[bot] 921c6fe654
New Crowdin Translations (automated) (#26498) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-13 15:10:41 +02:00
Robert R George 20666482ef
Added admin api for managing tags (#26872) 2023-09-13 11:22:53 +02:00
CSDUMMI 9a70cac9de
Fix #26849 by adding the domain of the current SSO provider to the form-action CSP (#26857) 2023-09-12 13:04:51 +02:00
Renaud Chaput e9b528eaee
Use NodeJS v20 by default (#26830) 2023-09-08 13:45:34 +02:00
Claire 475783d567
Add timezone to datetimes in e-mails (#26822) 2023-09-06 17:25:39 +02:00
Claire 77caba3789 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-05 20:34:17 +02:00
Claire cab4cbfa5c
Fix “Scoped order is ignored, it's forced to be batch order.” warnings (#26793) 2023-09-05 15:37:23 +02:00
Claire e66f961e05 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-04 18:27:46 +02:00
Christian Schmidt ea31929776
Fix invalid Content-Type header for WebP images (#26773) 2023-09-04 09:46:33 +02:00
Claire c107512fa6 Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02:00
Claire 4ed629cd7e Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
 2023-09-02 14:44:47 +02:00
Claire afc3b12217 Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated their README, we have a completely different one.
  Kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream has updated their development CSPs, while we disable CSPs in
  the development environment.
  Kept our version.
 2023-09-02 13:31:15 +02:00
Claire fbbe9f1c12 Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream 2023-09-02 12:20:33 +02:00
Claire 6b7c47311d Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream 2023-09-02 11:41:40 +02:00