b24f676cf1
Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream
11 months ago
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
11 months ago
a111fd7a0b
Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream
11 months ago
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
11 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.
11 months ago
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
11 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.
11 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.
11 months ago
33dd5d8179
Fix Ruby lint issues
11 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.
11 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.
11 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.
11 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`
11 months ago
046141d2a4
Fix i18n unused check being tripped by `no` in YAML files ( #2496 )
12 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
12 months ago
6cfa0245ca
Fix image and media loading when using external storage server
...
Fixes #2479
12 months ago
d59196e170
Change glitch-soc's CSP config to match upstream's closer ( #2474 )
1 year ago
7232d4750d
New Crowdin Translations (automated) ( #27884 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
bd575a1dd6
Add banner for forwarded reports made by remote users about remote content ( #27549 )
1 year ago
d67bd44ca1
Add profile setup to onboarding in web UI ( #27829 )
1 year ago
d8074128f9
New Crowdin Translations (automated) ( #27866 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
c1e071f634
New Crowdin Translations (automated) ( #27848 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
7e3c10dec6
Add icons for private and disabled boost in web UI ( #27817 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
07a4059901
Add support for invite codes in the registration API ( #27805 )
1 year ago
e5a7b73ef4
New Crowdin Translations (automated) ( #27815 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
46a28fc41f
New Crowdin translations
1 year ago
ac62b995ef
New Crowdin Translations (automated) ( #27804 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
9429e30d75
Disable sidekiq unique jobs in test env ( #27737 )
1 year ago
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
1 year ago
d6c971e158
New Crowdin Translations (automated) ( #27787 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
c875dfc90b
Fix `Lint/UnusedBlockArgument` cop ( #27777 )
1 year ago
c73d5a6075
Using Sidekiq concurrency for default db pool value ( #26488 )
1 year ago
5c328ae674
New Crowdin Translations (automated) ( #27768 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
33cc3ae8fa
Fix `Style/StabbyLambdaParentheses` cop ( #27771 )
1 year ago
757d7c73c0
Upgrade to Yarn 4, remove support for Node 16 ( #27073 )
1 year ago
23e32a4b30
Fix format-dependent redirects being cached regardless of requested format ( #27632 )
1 year ago
02d27de5ce
Move i18n locale configuration to separate initializer ( #27571 )
1 year ago
bbad5b6456
Remove false positive cop detection ( #27457 )
1 year ago
1b28ab7263
New Crowdin Translations (automated) ( #27687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops ( #27730 )
1 year ago
2d548e273e
New Crowdin Translations (automated) ( #27646 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
7ef56d6e50
Move json_ld context loaders to `config/initializers` ( #27590 )
1 year ago
3107a9410c
Silence deprecation warning about secrets/credentials with Devise patch ( #27578 )
1 year ago
0e3401bc1c
Improve Babel configuration and automatically load polyfills ( #27333 )
1 year ago
e5b7ae9576
New Crowdin Translations (automated) ( #27630 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
a918208ec6
New Crowdin Translations (automated) ( #27596 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
eae5c7334a
Extract class from CSP configuration/initialization ( #26905 )
1 year ago
1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec ( #27486 )
1 year ago
8ca16f032e
New Crowdin Translations (automated) ( #27583 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
bbf46cc418
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts ( #27459 )
1 year ago
Claire
github-actions[bot]
Eugen Rochko
GitHub Actions
Matt Jankowski
Jaehong Kang
Renaud Chaput