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 5dc634796aba951f6a085e1ed0e1b807e25d7d41 #2559

Merged
merged 64 commits into from
Jan 11, 2024
Merged

Merge upstream changes up to 5dc634796aba951f6a085e1ed0e1b807e25d7d41 #2559

merged 64 commits into from
Jan 11, 2024

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Jan 10, 2024 •
edited
Loading

Merge upstream changes up to fe2667b

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.

Ported changes

Additional changes

  • 2c70ca0 (increase Metrics/AbcSize limit)

Merge upstream changes up to a0e237a

Ported changes

Merge upstream changes up to 5dc6347

No conflicts nor anything to port

vmstan and others added 30 commits January 3, 2024 19:02
@vmstan
Fix .opus file uploads being misidentified by Paperclip (mastodon#28580)
195b89d
@ClearlyClaire
Add ability to require approval when users sign up using specific ema…
dfdadb9 
…il domains (mastodon#28468)
@renovate
Update dependency net-ldap to v0.19.0 (mastodon#28588)
38e5d1b 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency react-redux-loading-bar to v5.0.8 (mastodon#28587)
0f3f98c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency axios to v1.6.4 (mastodon#28586)
9c268c9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ThisIsMissEm
Streaming: use standard cors package instead of custom implementation (…
9826b77 
…mastodon#28523)
@renovate
Update dependency cssnano to v6.0.3 (mastodon#28581)
06374d0 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Fix Capybara/ClickLinkOrButtonStyle cop in spec/features (mastodon#…
f06c1f1 
…28576)
@mjankowski
Use heredoc on federation CLI warning strings (mastodon#28578)
1af5c37
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28590)
bdf4750 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
Update dependency stylelint-config-standard-scss to v13 (mastodon#28589)
da72908 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Add fallback redirection when getting a webfinger query `WEB_DOMAIN@W…
419c659 
…EB_DOMAIN` (mastodon#28592)
@ClearlyClaire
Fix scrolling to detailed status not always working (mastodon#28577)
d0fd14f
@mjankowski
Solve remaining db/*migrate* cops (mastodon#28579)
ae39bed
@mjankowski
Add sleep statement to nudge thread scheduler in request pool spec (m…
964a0ec 
…astodon#28596)
@ClearlyClaire
Add PAPERCLIP_ROOT_URL to Content-Security-Policy when used (mastod…
5f4643b 
…on#28561)
@renovate
Update dependency net-http to v0.4.1 (mastodon#28606)
9ecf99d 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency rubocop-rspec to v2.26.0 (mastodon#28595)
6b63652 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency sass-loader to v10.5.2 (mastodon#28594)
d537b39 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency postcss to v8.4.33 (mastodon#28602)
9699ea2 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@ClearlyClaire
Fix NULL MX handling and tighten DNS resolving specs (mastodon#28607)
6ad0fb5
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28604)
43d800a 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Regenerate rubocop todo with version 1.59.0 (mastodon#28597)
e1b49d3
@mjankowski
Remove deprecated RSpec/FilePath cop (mastodon#28601)
b3dab17
@mjankowski
Add validation specs to CustomFilter model (mastodon#28600)
12bed81
@byroot
Enable Rails 7.1 Marshalling format (mastodon#28609)
5a6d533
@renovate
Update dependency puma to v6.4.2 (mastodon#28640)
8a312ad 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update libretranslate/libretranslate Docker tag to v1.5.3 (mastodon#2…
352625c 
…8639)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Remove the 7.1 marshalling format "todo" from new_framework_defaults (m…
a27a829 
…astodon#28625)
@mjankowski
Move old framework defaults file to regular config value (mastodon#28623
e09419f 
)
mjankowski and others added 23 commits January 8, 2024 11:09
@mjankowski
Use Arel nulls_first method in ordering CustomEmojiFilter scope (ma…
57f49c8 
…stodon#28614)
@mjankowski
Use Arel in_order_of method to generate CASE for `DomainBlock.by_se…
202951e 
…verity` (mastodon#28617)
@mjankowski
Use normalizes to prepare CustomEmoji domain value (mastodon#28624)
aa6d07d
@mjankowski
Extract SQL heredoc method for Announcement scopes (mastodon#28613)
1bc5a52
@ClearlyClaire
Make request_pool_spec tests more robust (mastodon#28610)
157fc69
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28627)
cc67943 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Use Arel matches method in CustomEmoji search (mastodon#28615)
e827c46
@mjankowski
Remove unused scope User.emailable (mastodon#28647)
c52a593
@mjankowski
Remove unused *_silenced_accounts scopes on Status (mastodon#28644)
4ccba94
@mjankowski
Remove unused EmojiFormatter#count_tag_nesting method (mastodon#28643)
3e7a926
@mjankowski
Remove unused DomainBlock#affected_accounts_count method (mastodon#…
cd58e37 
…28642)
@mjankowski
Use normalizes to prepare Account#username value (mastodon#28646)
9322396
@mjankowski
Remove unused scope Announcement.without_muted (mastodon#28645)
3e43cd0
@mjankowski
Remove unused Announcement#time_range? (mastodon#28648)
e677eb1
@mjankowski
Replace unused by_recent_sign_in scope (mastodon#28616)
cd4b4d4
@mjankowski
Update haml_lint to version 0.53.0 (mastodon#28652)
557c27e
@renovate
Update babel monorepo to v7.23.8 (mastodon#28656)
f7b6195 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#28658)
8e7d5fe 
Co-authored-by: GitHub Actions <[email protected]>
@mjankowski
Fix haml-lint LineLength cop for `settings/preferences/notification…
68f06f1 
…s/show` (mastodon#28655)
@mjankowski
Misc coverage improvements re: sidekiq/inline (mastodon#28651)
5dc6347
@ClearlyClaire
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-s…
0b2c7cd 
…oc/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`.
@ClearlyClaire
[Glitch] Fix scrolling to detailed status not always working
7cd88ae 
Port d0fd14f to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
Increase Metrics/AbcSize limit
2c70ca0
@codecov-commenter
Copy link

Codecov Report

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

Comparison is base (dfbf960) 84.67% compared to head (2c70ca0) 84.64%.

Files Patch % Lines
...ontrollers/admin/email_domain_blocks_controller.rb 50.00% 1 Missing ⚠️
app/lib/content_security_policy.rb 83.33% 0 Missing and 1 partial ⚠️
app/models/user.rb 75.00% 0 Missing and 1 partial ⚠️
app/validators/email_mx_validator.rb 0.00% 0 Missing and 1 partial ⚠️

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

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2559      +/-   ##
==========================================
- Coverage   84.67%   84.64%   -0.03%     
==========================================
  Files        1046     1046              
  Lines       28741    28666      -75     
  Branches     4665     4657       -8     
==========================================
- Hits        24336    24265      -71     
+ Misses       3211     3206       -5     
- Partials     1194     1195       +1

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

@ClearlyClaire ClearlyClaire changed the title Merge upstream changes up to fe2667bb0d3487a32b9da5250402a90482a85fe2 Merge upstream changes up to 5dc634796aba951f6a085e1ed0e1b807e25d7d41 Jan 10, 2024
@ClearlyClaire ClearlyClaire marked this pull request as ready for review January 10, 2024 18:17
@ClearlyClaire ClearlyClaire merged commit b523188 into glitch-soc:main Jan 11, 2024
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.
7 participants
@ClearlyClaire @codecov-commenter @vmstan @ThisIsMissEm @mjankowski @byroot @renchap