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.

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

Merge upstream changes up to 3205a654caf903002c2db872f802a3332201678b #2585

Merged
merged 29 commits into from
Jan 27, 2024

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Jan 26, 2024

Notable changes are the addition of a confirmation screen instead of silently redirecting logged-out users to remote content, and the addition of an “active” variant for boost icons.

One of the last upstream merges before the great compose refactor with terrible string changes.

Conflicts

None

Ported changes

Postponed changes

Additional changes

  • dd7a669 (fix theme loading in redirect controller)

Gargron and others added 29 commits January 24, 2024 10:49
…astodon#27792)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…n#28858)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…28415)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
…malink

Port SCSS changes from b19ae52 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 5a838ce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
@codecov-commenter
Copy link

Codecov Report

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

Comparison is base (ae9c675) 84.81% compared to head (dd7a669) 84.85%.

Files Patch % Lines
lib/mastodon/cli/maintenance.rb 64.00% 9 Missing and 18 partials ⚠️
app/lib/permalink_redirector.rb 81.48% 2 Missing and 3 partials ⚠️
...ontrollers/admin/email_domain_blocks_controller.rb 0.00% 1 Missing ⚠️
...controllers/concerns/web_app_controller_concern.rb 85.71% 1 Missing ⚠️
app/controllers/redirect/accounts_controller.rb 80.00% 0 Missing and 1 partial ⚠️
app/controllers/redirect/base_controller.rb 93.33% 1 Missing ⚠️
app/controllers/redirect/statuses_controller.rb 80.00% 0 Missing and 1 partial ⚠️
app/workers/move_worker.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    #2585      +/-   ##
==========================================
+ Coverage   84.81%   84.85%   +0.03%     
==========================================
  Files        1062     1065       +3     
  Lines       28826    28872      +46     
  Branches     4654     4660       +6     
==========================================
+ Hits        24450    24499      +49     
+ Misses       3179     3173       -6     
- Partials     1197     1200       +3     

☔ 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 January 26, 2024 20:29
@ClearlyClaire ClearlyClaire merged commit 420ca90 into glitch-soc:main Jan 27, 2024
37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants