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 2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2 #2477

Merged
merged 25 commits into from
Dec 12, 2023
Merged

Merge upstream changes up to 2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2 #2477

merged 25 commits into from
Dec 12, 2023

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Nov 20, 2023 •
edited
Loading

Conflicts

  • README.md:
    Upstream has updated their README but we have a completely different one.
    Kept our version of README.md

Skipped changes

  • 08bdd57 (already fixed in glitch-soc)

Postponed changes

ClearlyClaire and others added 24 commits October 25, 2023 21:33
@ClearlyClaire
Fix confusing screen when visiting a confirmation link for an already…
49b8433 
…-confirmed email (mastodon#27368)
@renovate
Update dependency sass to v1.69.5 (mastodon#27566)
6e018f7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency @material-symbols/svg-600 to v0.13.2 (mastodon#27565)
400f5c9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Use next keyword in field loop in admin/accounts/index view (mastod…
3ca974e 
…on#27559)
@renchap
Use a context to propagate column-related Props, and remove `forceUpd…
5374428 
…ate` usage (mastodon#27548)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#27567)
3427b51 
Co-authored-by: GitHub Actions <[email protected]>
@ClearlyClaire
Fix error when trying to delete already-deleted file with OpenStack S…
75255c0 
…wift (mastodon#27569)
@fixermark
Issue 26048: swap "muting" and "blocking" list options in settings ->…
ba8dcb5 
… Data Exports (mastodon#26088)
@ClearlyClaire
Fix report processing notice not mentioning the report number when pe…
d2f52f7 
…rforming a custom action (mastodon#27442)
@srapilly
Add HTML lang attribute to preview card descriptions (mastodon#27503)
2d8f759
@mjankowski
Capture minimum postgres version 12 (mastodon#27528)
4aa05d4
@mjankowski
Use Rails.env.local? shorthand method to check env (mastodon#27519)
12550a6
@Gargron
Fix various icon styles in web UI (mastodon#27579)
fa7e64d
@tribela
Handle featured collections without items (mastodon#27581)
8f998cd
@ClearlyClaire
Fix error and incorrect URLs in /api/v1/accounts/:id/featured_tags …
bbf46cc 
…for remote accounts (mastodon#27459)
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#27583)
8ca16f0 
Co-authored-by: GitHub Actions <[email protected]>
@renovate
Update libretranslate/libretranslate Docker tag to v1.4.0 (mastodon#2…
37929b9 
…7504)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@mjankowski
Misc spec/refactor to user mailer and user mailer spec (mastodon#27486)
1f5187e
@renchap
Simplify column headers (mastodon#27557)
13d310e
@renovate
Update dependency pundit to v2.3.1 (mastodon#27585)
15ef654 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@SouthFox-D
Fix account click on detailed status (mastodon#27587)
08bdd57
@ClearlyClaire
Fix hashtag matching pattern matching some URLs (mastodon#27584)
93e4cdc
@ShadowJonathan @ClearlyClaire
Have Follow activities bypass availability (mastodon#27586)
1cc5129 
Co-authored-by: Claire <[email protected]>
@mjankowski
Use deliveries.size in mailer-related examples in controller specs (m…
2e6bf60 
…astodon#27589)
github-advanced-security[bot]
github-advanced-security bot found potential problems Nov 20, 2023
View reviewed changes
spec/models/tag_spec.rb Dismissed Show dismissed Hide dismissed
@ClearlyClaire
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-s…
9f92b05 
…oc/merge-upstream

Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`
@ClearlyClaire ClearlyClaire force-pushed the glitch-soc/merge-upstream branch from 61a800f to 9f92b05 Compare December 10, 2023 17:05
@ClearlyClaire ClearlyClaire marked this pull request as ready for review December 11, 2023 11:05
@ClearlyClaire ClearlyClaire merged commit b724848 into glitch-soc:main Dec 12, 2023
44 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.
9 participants
@ClearlyClaire @mjankowski @renchap @fixermark @srapilly @Gargron @tribela @SouthFox-D @ShadowJonathan