ab195bcee1
New Crowdin translations
3 months ago
Jeremy Kescher
de1e89f42c
Merge branch 'glitch-soc' into develop
3 months ago
ccdf56085d
Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream
3 months ago
7f84bbfd92
New Crowdin Translations (automated) ( #29430 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
a482932649
Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Not a real conflict, upstream fixed a bug in a line adjacent to code
modified by glitch-soc.
Ported upstream's change.
3 months ago
bc4c5ed918
New Crowdin Translations (automated) ( #29423 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
67ca8bb56a
Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Change applied to `app/javascript/core/admin.js` instead.
3 months ago
98e3dc2578
New Crowdin Translations (automated) ( #29382 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
Jeremy Kescher
009251a17d
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/initial_state.js
# app/serializers/initial_state_serializer.rb
# config/initializers/chewy.rb
# config/locales/en.yml
# config/locales/ja.yml
3 months ago
2dc244784c
Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream
3 months ago
1ad91dece8
Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Changes applied to `app/javascript/core/admin.js` instead.
3 months ago
7901dc9e24
Merge commit '491dd9764244c8adf37861f00d916c96bdbfdaf8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/workers/scheduler/auto_close_registrations_scheduler.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
3 months ago
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
3 months ago
ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
3 months ago
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
3 months ago
5b9ddfcfcc
Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream
3 months ago
Jeremy Kescher
6e635a4283
Clarify English locale
3 months ago
20615a516d
Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream
3 months ago
d518f06eae
Add reject blurhash to Admin setting
3 months ago
Jeremy Kescher
a4e12a484d
Merge branch 'glitch-soc' into develop
3 months ago
aca691726b
Fix #21492 Add missing WebP hint in avatar/header localizations ( #22395 )
3 months ago
bba4118ddd
New Crowdin Translations (automated) ( #29369 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
d23f445527
Automatically switch from open to approved registrations in absence of moderators ( #29318 )
3 months ago
b71904816a
Change registrations to be disabled by default for new servers ( #29280 )
3 months ago
449fcf1ae7
New Crowdin Translations (automated) ( #29343 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
2751acb6cd
Automatically switch from open to approved registrations in absence of moderators ( #29318 )
3 months ago
fd2b6c29c6
New Crowdin Translations (automated) ( #29311 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
9a2b9d1484
New Crowdin Translations (automated) ( #29298 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
ad16362efe
New Crowdin Translations (automated) ( #29255 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
5255bd08e0
Add reject pattern to Admin setting (Ported to Glitch Soc)
...
# Conflicts:
# app/views/admin/settings/shared/_links.html.haml
# config/routes/admin.rb
3 months ago
1d9d14b8de
Use `abort` instead of `warn(); exit` in boot.rb env check ( #29209 )
3 months ago
Jeremy Kescher
ce878a78bb
Merge branch 'glitch-soc' into develop
3 months ago
1c93d625c6
New Crowdin Translations (automated) ( #29195 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
e7ca82762d
Fix user creation failure handling in OAuth paths ( #29207 )
3 months ago
d4d0565b0f
Fix user creation failure handling in OAuth paths ( #29207 )
3 months ago
Jeremy Kescher
1c9291adcd
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/styles/components/accounts.scss
# app/javascript/flavours/glitch/styles/components/status.scss
3 months ago
3c3ef8b9d3
Add `sidekiq_unique_jobs:delete_all_locks` task and disable `sidekiq-unique-jobs` UI by default ( #29199 )
3 months ago
554e2a019e
Add `sidekiq_unique_jobs:delete_all_locks` task and disable `sidekiq-unique-jobs` UI by default ( #29199 )
3 months ago
eae436c5a8
Disable administrative doorkeeper routes ( #29187 )
3 months ago
46142cdbdd
Disable administrative doorkeeper routes ( #29187 )
3 months ago
6482948547
New Crowdin Translations (automated) ( #29156 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
8125dae5a8
Rename `ES_CA_CERT` to `ES_CA_FILE` for consistency ( #29147 )
3 months ago
c07028b2fa
New Crowdin Translations (automated) ( #29152 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
2a362d62a8
New Crowdin Translations (automated) ( #29145 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
17052714a2
New Crowdin Translations (automated) ( #29121 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
2912829411
Add support for specifying custom CA cert for Elasticsearch ( #29122 )
3 months ago
Jeremy Kescher
40ef7b3849
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/serializers/initial_state_serializer.rb
3 months ago
19f1ffe287
Fix self-destruct schedule not actually replacing initial schedule ( #29049 )
3 months ago
90ccf7beb2
New Crowdin Translations (automated) ( #28965 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
3 months ago
64300e0fe3
Fix self-destruct schedule not actually replacing initial schedule ( #29049 )
3 months ago
ce0d134147
Add `redirect_with_vary` to `AllowedMethods` for `Style/FormatStringToken` cop ( #28973 )
4 months ago
Jeremy Kescher
c2c2afc294
Merge branch 'glitch-soc' into develop
4 months ago
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
4 months ago
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>
4 months ago
45287049ab
New Crowdin Translations (automated) ( #28923 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
4 months ago
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
4 months ago
c8f59d2ca4
Fix `Style/TernaryParentheses` cop ( #28387 )
4 months ago
59d2ea0d82
New Crowdin Translations (automated) ( #28899 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
4 months ago
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.
4 months ago
b19ae521b7
Add confirmation when redirecting logged-out requests to permalink ( #27792 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
4 months ago
a34d27c18f
New Crowdin Translations (automated) ( #28875 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
4 months ago
5b1eb09d54
Add annual reports for accounts ( #28693 )
4 months ago
78ee1453f9
New Crowdin Translations (automated) ( #28857 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
4 months ago
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
4 months ago
e2d9635074
Add notification email on invalid second authenticator ( #28822 )
4 months ago
76e383ea1e
New Crowdin Translations (automated) ( #28827 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
4 months ago
3593ee2e36
Add rate-limit of TOTP authentication attempts at controller level ( #28801 )
4 months ago
5fc4ae7c5f
Move privacy policy into markdown file ( #28699 )
4 months ago
9cd17020bc
New Crowdin Translations (automated) ( #28798 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
4 months ago
Jeremy Kescher
93ae46fa14
Merge branch 'glitch-soc' into develop
4 months ago
Jeremy Kescher
5d4cfe4cd8
Merge branch 'glitch-soc' into develop
4 months ago
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.
4 months ago
1ab42ad12b
New Crowdin Translations (automated) ( #28749 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
4 months ago
c523a9601b
Rename local webpack* var in development env CSP config ( #28766 )
4 months ago
0ce081fe49
Remove monkey patch in favor of supported Devise config value ( #28760 )
4 months ago
e4d07c7bcc
Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream
4 months ago
01b6c83c36
Add a new `@/` alias for the root frontend directory and use it where possible ( #28753 )
4 months ago
01df34b9db
Remove bypass and use use glitch-soc's theming system for inert.css
4 months ago
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.
4 months ago
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
4 months ago
464051c2d2
Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream
4 months ago
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.
4 months ago
1323dfac80
Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream
4 months ago
7f471e70c0
Update new email templates ( #28416 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online>
4 months ago
1012ffac9e
New Crowdin Translations (automated) ( #28721 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
4 months ago
Jeremy Kescher
c677b8de19
v4.3.0-alpha.0+glitch+cat+1.0.5
4 months ago
6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons ( #28064 )
4 months ago
608f66f978
Change icon SVG imports to use a default import ( #28709 )
4 months ago
b86083f0dc
New Crowdin Translations (automated) ( #28708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
4 months ago
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.
4 months ago
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
4 months ago
51d2d98174
Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream
4 months ago
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`.
4 months ago
4e02838832
Enable "low risk" Rails 7.1 setting defaults ( #28626 )
4 months ago
01ca84e541
New Crowdin Translations (automated) ( #28660 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
4 months ago
173953c23e
Fix ISO code for Canadian French ( #26015 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
4 months ago
8e7d5fe2ac
New Crowdin Translations (automated) ( #28658 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
4 months ago
cc67943df2
New Crowdin Translations (automated) ( #28627 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
4 months ago
a0e237a96f
Upgrade Redux packages ( #28585 )
4 months ago
e09419f22a
Move old framework defaults file to regular config value ( #28623 )
4 months ago
a27a82939d
Remove the 7.1 marshalling format "todo" from new_framework_defaults ( #28625 )
4 months ago
59be64f1d6
Fix "Too many open files" errors when using ElasticSearch
...
This change sets the Faraday adapter used for ElasticSearch to `:net_http`.
The `elasticsearch-transport` gem tries to auto detect a suitable Faraday
adapter. Mastodon uses the Faraday default adapter of `:net_http`, but since
`elasticsearch-transport` sees that the `httpclient` gem is available it lets
Faraday use that one. Unfortunately `httpclient` does not properly clean up
its connections, leading to a lot of established connections to ElasticSearch
over time.
See also: e074fcff9b/lib/elastic/transport/client.rb (L291-L304)https://github.com/mastodon/mastodon/pull/27138 )
4 months ago
5a6d533c53
Enable Rails 7.1 Marshalling format ( #28609 )
4 months ago
43d800ada6
New Crowdin Translations (automated) ( #28604 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
4 months ago
Jeremy Kescher
3b9a52aab6
Merge branch 'glitch-soc' into develop
5 months ago
Jeremy Kescher
abb21a1eab
Merge branch 'glitch-soc' into develop
5 months ago
bdf4750633
New Crowdin Translations (automated) ( #28590 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
5 months ago
9d9008666b
Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream
5 months ago
bd415af9a1
Change streaming API host to not be overridden to localhost in development mode ( #28557 )
5 months ago
7cce2a41f2
New Crowdin Translations (automated) ( #28573 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
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.
5 months ago
Jeremy Kescher
5be3fb3d66
Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions
5 months ago
0374e11091
New Crowdin Translations (automated) ( #28529 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
08a21c1af6
Add notification emails for reactions
5 months ago
6ae86f40d1
Add support for emoji reactions
...
Squashed, modified, and rebased from glitch-soc/mastodon#2221 .
Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
5 months ago
35b6583371
Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream
5 months ago
7df9c4f6f3
New Crowdin Translations (automated) ( #28481 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
5 months ago
19e14654cc
Reduce CSP configuration changes with upstream ( #2536 )
5 months ago
e70a65761a
New Crowdin Translations (automated) ( #28467 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
92aa6e2ec9
Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream
5 months ago
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.
5 months ago
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
5 months ago
a60b9acf3c
Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream
5 months ago
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.
5 months ago
9e5ddc1745
New Crowdin Translations (automated) ( #28451 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
b2961dad2b
Fix lint issue in glitch-soc-only file
5 months ago
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.
5 months ago
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
5 months ago
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.
5 months ago
ac04e62a0e
Remove unused route definitions ( #28430 )
5 months ago
fecc07856c
New Crowdin Translations (automated) ( #28439 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
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.
5 months ago
6c00d5b0c4
Fix test failure caused by glitch-soc changes
5 months ago
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.
5 months ago
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
5 months ago
b24f676cf1
Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream
5 months ago
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
5 months ago
fa987db738
New Crowdin Translations (automated) ( #28423 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
5 months ago
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
5 months ago
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.
5 months ago
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
5 months ago
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.
5 months ago
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.
5 months ago
89d468ada7
Fix `Style/StderrPuts` cop ( #28389 )
5 months ago
e56fb9e489
Fix `Style/SymbolProc` cop ( #28386 )
5 months ago
f99e05710e
New Crowdin Translations (automated) ( #28373 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
33dd5d8179
Fix Ruby lint issues
5 months ago
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.
5 months ago
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.
5 months ago
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.
5 months ago
e5717c9bc6
Fix `Style/Lambda` cop ( #28378 )
5 months ago
1ee8d1e50e
Assign a proc to `Rack::Request.ip_filter` instead of patching method ( #28380 )
5 months ago
b2f915b31a
New Crowdin Translations (automated) ( #28344 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
f37c93f3d7
Change cookie rotator to use SHA1 digest for new cookies ( #27392 )
5 months ago
393e851649
Change Rails' cache format to 7.0 ( #27393 )
5 months ago
14e64bc880
New Crowdin Translations (automated) ( #28334 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
79a81da69c
New Crowdin Translations (automated) ( #28291 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
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`
5 months ago
ca1b7efb06
New Crowdin Translations (automated) ( #28275 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
e0dacf6b4c
New Crowdin Translations (automated) ( #28264 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
42afd30324
Replace Sprockets with Propshaft ( #28239 )
5 months ago
954169966b
New Crowdin Translations (automated) ( #28245 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
5 months ago
4238ec844d
New Crowdin Translations (automated) ( #28120 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
6 months ago
046141d2a4
Fix i18n unused check being tripped by `no` in YAML files ( #2496 )
6 months ago
5631f139c1
Fix `Lint/SymbolConversion` cop ( #28175 )
6 months ago
a8473f582d
Add zeitwerk inflector for cli->CLI ( #27635 )
6 months ago
85662a5a57
Change `img-src` and `media-src` CSP directives to not include `https:` ( #28025 )
6 months ago
a1636fce7f
Move lib/devise/* to lib/devise/strategies/* ( #27638 )
6 months ago
31bef99b9e
Move lib/mastodon/premailer_webpack_strategy to lib/ ( #27636 )
6 months ago
af02484714
New Crowdin Translations (automated) ( #28096 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
fad9343bab
New Crowdin Translations (automated) ( #28069 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
660372d130
Revert recent CSP changes ( #2485 )
...
* Revert "Fix image and media loading when using external storage server"
This reverts commit 6cfa0245ca#2474 )"
This reverts commit d59196e170
6 months ago
8521238677
New Crowdin Translations (automated) ( #28060 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
c810b197ad
New Crowdin Translations (automated) ( #28050 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
d3ed03fd6b
New Crowdin Translations (automated) ( #28036 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
6cfa0245ca
Fix image and media loading when using external storage server
...
Fixes #2479
6 months ago
6d51ac246b
Update partials for the `AdminMailer.new_trends` mailer ( #28011 )
6 months ago
3c3e0c25ef
New Crowdin Translations (automated) ( #28015 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
d59196e170
Change glitch-soc's CSP config to match upstream's closer ( #2474 )
6 months ago
8ceae2bce6
New Crowdin Translations (automated) ( #27966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
9c68741f46
New Crowdin Translations (automated) ( #27914 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
7232d4750d
New Crowdin Translations (automated) ( #27884 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
bd575a1dd6
Add banner for forwarded reports made by remote users about remote content ( #27549 )
6 months ago
d67bd44ca1
Add profile setup to onboarding in web UI ( #27829 )
6 months ago
d8074128f9
New Crowdin Translations (automated) ( #27866 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
c1e071f634
New Crowdin Translations (automated) ( #27848 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
7e3c10dec6
Add icons for private and disabled boost in web UI ( #27817 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
6 months ago
07a4059901
Add support for invite codes in the registration API ( #27805 )
6 months ago
e5a7b73ef4
New Crowdin Translations (automated) ( #27815 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
46a28fc41f
New Crowdin translations
6 months ago
ac62b995ef
New Crowdin Translations (automated) ( #27804 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
9429e30d75
Disable sidekiq unique jobs in test env ( #27737 )
6 months ago
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
6 months ago
d6c971e158
New Crowdin Translations (automated) ( #27787 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
c875dfc90b
Fix `Lint/UnusedBlockArgument` cop ( #27777 )
6 months ago
c73d5a6075
Using Sidekiq concurrency for default db pool value ( #26488 )
6 months ago
5c328ae674
New Crowdin Translations (automated) ( #27768 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
6 months ago
GitHub Actions
Jeremy Kescher