me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19903 commits 2 branches 0 tags 429 MiB
Commit graph

3382 commits

Author SHA1 Message Date
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
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
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
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
Claire
046141d2a4
Fix i18n unused check being tripped by no in YAML files (#2496) 2023-12-03 11:21:34 +01: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]
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