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 4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd #2535

Merged
merged 42 commits into from
Dec 21, 2023
Merged

Merge upstream changes up to 4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd #2535

merged 42 commits into from
Dec 21, 2023

Conversation

ClearlyClaire
Copy link

Merge upstream changes up to 4a7395d

Conflicts

  • README.md:
    Upstream modified its README, we have a completely different one.
    Kept our README file.

Already ported changes

kengreeff and others added 30 commits December 7, 2023 12:45
@kengreeff
Add note to install libidn on MacOS (mastodon#28259)
5d97a89
@mjankowski
Formalize some patterns in cli specs (mastodon#28255)
ad34d33
@vmstan @ClearlyClaire
Error handling for attachment batch delete process (mastodon#28184)
da3d8af 
Co-authored-by: Claire <[email protected]>
@mjankowski
Use composite primary key for PreviewCardsStatus model (mastodon#28208
3918dc6 
)
@mjankowski
Add spec coverage for CLI::Media#lookup command (mastodon#28266)
8d8ae05
@mjankowski
Convert api/v2/search controller spec to request spec (mastodon#28269)
7e51468
@mjankowski
Add spec for CLI::Domains#crawl command (mastodon#28271)
8de86ea
@JakePaustian
Update CONTRIBUTING.md with additional requirements for API additions (…
f37a153 
…mastodon#28274)

Co-authored-by: Jake Paustian <[email protected]>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28275)
ca1b7ef 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Add spec for CLI::Search#deploy command (mastodon#28272)
a3cbb4b
@mjankowski
Correct section naming in maintenance cli script (mastodon#28279)
490e496
@vmstan
Change preview card deletes to be done using batch method (mastodon#2…
afc8550 
…8183)
@renovate
Update eslint (non-major) (mastodon#28313)
bd88883 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency typescript to v5.3.3 (mastodon#28312)
d0e7999 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency prettier to v3.1.1 (mastodon#28311)
7ddd937 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update DefinitelyTyped types (non-major) (mastodon#28310)
a117155 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency ws to v8.15.0 (mastodon#28308)
b82fc8a 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Fix intermittent failure from unspecified order in `api/v1/accounts/r…
11d2bd9 
…elationships` spec (mastodon#28306)
@mjankowski
Controller spec to request spec: api/v1/accounts/familiar_followers (…
78347d2 
…mastodon#28305)
@mjankowski
Controller spec to request spec: api/v1/accounts/identify_proofs (m…
8f94502 
…astodon#28304)
@mjankowski
Controller spec to request spec: api/v1/accounts/lists (mastodon#28303
a968898 
)
@mjankowski
Controller spec to request spec: api/v1/accounts/lookup (mastodon#2…
e544b6d 
…8302)
@mjankowski
Controller spec to request spec: api/v1/accounts/notes (mastodon#28301
94cc707 
)
@mjankowski
Controller spec to request spec: api/v1/accounts/pins (mastodon#28300)
809506b
@mjankowski
Controller spec to request spec: api/v1/featured_tags/suggestions (m…
16ede59 
…astodon#28298)
@renovate
Update dependency addressable to v2.8.6 (mastodon#28296)
f5d6143 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Only attempt to remove indexes that exist in CLI::Maintenance script (
253393f 
mastodon#28286)
@mjankowski
Controller spec to request spec: api/v1/accounts/search (mastodon#2…
0c64092 
…8299)
@mjankowski
Controller spec to request spec: api/v2/suggestions (mastodon#28297)
0e4233d
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28291)
79a81da 
Co-authored-by: GitHub Actions <[email protected]>
renovate bot and others added 12 commits December 11, 2023 08:45
@renovate
Update dependency debug to v1.9.0 (mastodon#28315)
4ad2e87 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Combine CLI::... spec example subjects (mastodon#28285)
b5a1013
@ClearlyClaire
Fix notification sounds (mastodon#28316)
f3864db
@renovate
Update babel monorepo to v7.23.6 (mastodon#28319)
9dfa940 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Fix Style/RedundantArgument cop (mastodon#28321)
2c63699
@ClearlyClaire
Fix LinkCrawlWorker error when encountering empty OEmbed response (m…
a8a5c65 
…astodon#28268)
@ClearlyClaire
Fix status edits not always being streamed to mentioned users (mastod…
89a496b 
…on#28324)
@renovate
Update dependency oj to v3.16.3 (mastodon#28332)
8078520 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28334)
14e64bc 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
Update dependency stylelint-config-standard-scss to v12 (mastodon#28333)
ca51e41 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Add migrator_version method to CLI maintenance script (mastodon#28323)
4a7395d
@ClearlyClaire
Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-s…
6e56f95 
…oc/merge-upstream

Conflicts:
- `README.md`:
  Upstream modified its README, we have a completely different one.
  Kept our README file.
@codecov-commenter
Copy link

Codecov Report

Attention: 26 lines in your changes are missing coverage. Please review.

Comparison is base (d668b85) 83.09% compared to head (6e56f95) 83.39%.

Files Patch % Lines
lib/mastodon/cli/maintenance.rb 21.05% 15 Missing ⚠️
app/lib/attachment_batch.rb 18.18% 9 Missing ⚠️
app/services/fetch_oembed_service.rb 0.00% 0 Missing and 1 partial ⚠️
lib/mastodon/cli/domains.rb 66.66% 1 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2535      +/-   ##
==========================================
+ Coverage   83.09%   83.39%   +0.29%     
==========================================
  Files        1045     1045              
  Lines       28710    28726      +16     
  Branches     4660     4664       +4     
==========================================
+ Hits        23856    23955      +99     
+ Misses       3705     3606      -99     
- Partials     1149     1165      +16

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ClearlyClaire ClearlyClaire marked this pull request as ready for review December 21, 2023 17:48
@ClearlyClaire ClearlyClaire merged commit dac2b56 into glitch-soc:main Dec 21, 2023
36 of 37 checks passed
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.
6 participants
@ClearlyClaire @codecov-commenter @kengreeff @mjankowski @vmstan @JakePaustian