Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream changes up to b2c5b20ef27edd948eca8d6bd2014b7a5efaec11 #2522

Merged
merged 97 commits into from
Dec 19, 2023
Merged

Merge upstream changes up to b2c5b20ef27edd948eca8d6bd2014b7a5efaec11 #2522

merged 97 commits into from
Dec 19, 2023

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Dec 18, 2023 •
edited
Loading

⚠️ This version drops Node.JS 16 support and switches from yarn 1 to yarn 4

Merge upstream changes up to 23e32a4

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.

Postponed changes

  • 58f01a5 (postponed to later in the same PR)

Skipped changes

  • d3cd37d this commit is pretty broken

Merge upstream changes up to 757d7c7

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.

Merge upstream changes up to b87bfb8

Postponed changes

Merge upstream changes up to 7840c6b

Conflicts

  • app/controllers/api/v1/accounts/relationships_controller.rb:
    We differed by listing suspended users when requesting relationships.
    Updated to upstream's code.

Ported changes

Additional changes

Merge upstream changes up to a36b59b

Ported changes

Merge upstream changes up to b2c5b20

Ported changes

Postponed changes

mjankowski and others added 30 commits November 7, 2023 15:19
@mjankowski
Remove unused before block from settings/branding spec (mastodon#27759)
dc0bf87
@mjankowski
Use strings instead of numeric literals and remove rubocop:disable …
a688a9e 
…in cache spec (mastodon#27742)
@mjankowski
Consolidate JSON parsing in serializers specs (mastodon#27693)
1d51e10
@mjankowski
Add coverage for CLI::Maintenance#fix_duplicates command (mastodon#…
370802c 
…25252)
@mjankowski
Move i18n locale configuration to separate initializer (mastodon#27571)
02d27de
@mjankowski
Move search and streaming spec manager classes to separate support fi…
ae7c20b 
…les (mastodon#27727)
@mjankowski
Account statuses filter spec speedup (mastodon#27674)
ee57bb4
@thehydrogen
Add volume saving/reuse to video player (mastodon#27488)
58f01a5
@jasminjohal @renchap
Change alt text to empty string for avatars (mastodon#21875)
27cbdc6 
Co-authored-by: Renaud Chaput <[email protected]>
@renovate
Update dependency strong_migrations to v1.6.4 (mastodon#27631)
b41e9b1 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency aws-sdk-s3 to v1.136.0 (mastodon#26999)
feea257 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency json-schema to v4.1.1 (mastodon#26933)
110ace0 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency json-ld to v3.3.0 (mastodon#26762)
b2619a1 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency sidekiq-unique-jobs to v7.1.30 (mastodon#26091)
1341790 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency thor to v1.3.0 (mastodon#27464)
4b8aee7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency json-ld-preloaded to v3.3.0 (mastodon#26763)
bcdfb72 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency selenium-webdriver to v4.15.0 (mastodon#27649)
b36b353 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update formatjs monorepo (mastodon#27746)
ac9f92b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency simple_form to v5.3.0 (mastodon#27725)
8b0d86d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency sanitize to v6.1.0 (mastodon#27723)
565d9a6 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency react-select to v5.8.0 (mastodon#27722)
14e49e5 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency net-http to '~> 0.4.0' (mastodon#27721)
389a6cc 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@TheDevJoao
Feature - Prevents multiple audio/video attachments from being played…
d3cd37d 
… at the same time (mastodon#24717)
@mjankowski
Deduplicate yarn lock file (mastodon#27670)
790f635
@mjankowski
Use framework helpers instead of i-vars in controller specs (mastodon…
e545978 
…#27767)
@ClearlyClaire
Fix format-dependent redirects being cached regardless of requested f…
23e32a4 
…ormat (mastodon#27632)
@renchap
Upgrade to Yarn 4, remove support for Node 16 (mastodon#27073)
757d7c7
@mjankowski
Fix Style/StabbyLambdaParentheses cop (mastodon#27771)
33cc3ae
@mjankowski
Remove unmatched rubocop:enable declaration (mastodon#27769)
7d6bcc0
@mjankowski
Simplify request cache spec shared examples (mastodon#27673)
9b7b4d7
mjankowski and others added 19 commits November 13, 2023 14:53
@mjankowski
Add Api::V1::Statuses::BaseController base controller class (mastod…
0945e25 
…on#27794)
@mjankowski
Use hash_including to check AccountFilter setup in `admin/account…
49ba5a9 
…s` controller spec (mastodon#27838)
@ClearlyClaire
Add variable delay before link verification of remote account links (m…
bac9e0b 
…astodon#27774)
@mjankowski
Use normalizes to prepare Webhook#events value (mastodon#27605)
b7807f3
@brianholley
Fix "Hide these posts from home" list setting not refreshing when swi…
4aa06cb 
…tching lists (mastodon#27763)
@mjankowski
Remove double subject in api/v1/accounts/relationships spec (mastod…
5e2ecc7 
…on#27839)
@renovate
Update formatjs monorepo (mastodon#27849)
373aa95 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Extract private methods in api/v1/instances/domain_blocks (mastodon#2…
1f8173a 
…7844)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#27848)
c1e071f 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
Update Yarn to v4.0.2 (mastodon#27851)
4eb4e8b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Specs for minimal CSP policy in Api:: controllers (mastodon#27845)
d562fb8
@mjankowski
Fix RSpec/AnyInstance cop (mastodon#27810)
b2c5b20
@ClearlyClaire
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-s…
bc33be0 
…oc/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.
@ClearlyClaire
Merge commit '757d7c73c0ca3750ac9e74a7e962f71c535a7bd0' into glitch-s…
cd2ee0e 
…oc/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.
@ClearlyClaire
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-s…
46ddaff 
…oc/merge-upstream
@ClearlyClaire
Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-s…
b474cbb 
…oc/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.
@thehydrogen @ClearlyClaire
[Glitch] Add volume saving/reuse to video player
372c455 
Port 58f01a5 to glitch-soc

Signed-off-by: Claire <[email protected]>
@thehydrogen @ClearlyClaire
[Glitch] Do not try to update an undefined video element
dee28c3 
Port 7840c6b to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Allow viewing and severing relationships with suspended acco…
f5de9fe 
…unts

Port c451bbe to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire ClearlyClaire changed the title Merge upstream changes up to 23e32a4b3031d1da8b911e0145d61b4dd47c4f96 Merge upstream changes up to 7840c6b75b61e64d89d7fd9f291277fb177e513f Dec 18, 2023
@ClearlyClaire ClearlyClaire changed the title Merge upstream changes up to 7840c6b75b61e64d89d7fd9f291277fb177e513f Merge upstream changes up to a36b59be8ad7656b7ceab9751c9ec5b3563e3a30 Dec 18, 2023
@ClearlyClaire ClearlyClaire marked this pull request as ready for review December 18, 2023 18:58
@ClearlyClaire ClearlyClaire changed the title Merge upstream changes up to a36b59be8ad7656b7ceab9751c9ec5b3563e3a30 Merge upstream changes up to b2c5b20ef27edd948eca8d6bd2014b7a5efaec11 Dec 18, 2023
@ClearlyClaire ClearlyClaire merged commit 4fdbffc into glitch-soc:main Dec 19, 2023
34 checks passed
@ClearlyClaire ClearlyClaire mentioned this pull request Dec 19, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.