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 9f218c9924b883207a3463a29314c92032cf06df #2446

Merged
merged 16 commits into from
Oct 19, 2023
Merged

Merge upstream changes up to 9f218c9924b883207a3463a29314c92032cf06df #2446

merged 16 commits into from
Oct 19, 2023

Conversation

ClearlyClaire
Copy link

Conflicts

None

Ported changes

ClearlyClaire and others added 14 commits October 18, 2023 10:18
@ClearlyClaire
Fix duplicate github annotations for rspec failures (mastodon#27450)
e9dc30c
@danielmbrasil
Add test coverage for Mastodon::CLI::Accounts#prune (mastodon#25204)
091a21e
@mjankowski
Fix Performance/DeletePrefix cop (mastodon#27448)
63a2a4b
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#27454)
4612576 
Co-authored-by: GitHub Actions <[email protected]>
@ThisIsMissEm
Feature: Allow token introspection without read scope (mastodon#27142)
7c3fea7
@mjankowski
Fix Naming/VariableNumber cop (mastodon#27447)
a1b27d8
@ClearlyClaire
Only enable github-rspec for pull_request events (mastodon#27456)
510845b
@renchap
The class props should be className (mastodon#27462)
10df97c
@lambda
Consider shown and pending status in explore prompt calculation (mast…
f76e511 
…odon#27466)

Co-authored-by: Brian Campbell <[email protected]>
@github-actions @web-flow
New Crowdin Translations (automated) (mastodon#27465)
1ffd5a9 
Co-authored-by: GitHub Actions <[email protected]>
@danielmbrasil
Add test coverage for Mastodon::CLI::Accounts#migrate (mastodon#25284)
7bc8f03
@mjankowski
Fix Lint/UselessAssignment cop (mastodon#27472)
bcd0171
@mjankowski
Refactor appeal partial to avoid brakeman XSS warning (mastodon#25880)
9f218c9
@ClearlyClaire
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-s…
74fd46d 
…oc/merge-upstream
@ClearlyClaire ClearlyClaire marked this pull request as ready for review October 19, 2023 17:34
@Plastikmensch
Copy link

10df97c is only partially ported.
The change in features/ui/components/link_footer.jsx is not included in the port.

renchap and others added 2 commits October 19, 2023 20:23
@ClearlyClaire ClearlyClaire force-pushed the glitch-soc/merge-upstream branch from 882dfc6 to 1a3248d Compare October 19, 2023 18:23
Plastikmensch
Plastikmensch approved these changes Oct 19, 2023
View reviewed changes
Copy link

@Plastikmensch Plastikmensch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@ClearlyClaire
Copy link
Author

Good catch! Sorry about that

@Plastikmensch
Copy link

Good catch! Sorry about that

No worries!

@ClearlyClaire ClearlyClaire merged commit 1c53aec into glitch-soc:main Oct 19, 2023
37 of 38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Plastikmensch Plastikmensch Plastikmensch approved these changes

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 @Plastikmensch @danielmbrasil @mjankowski @ThisIsMissEm @renchap @lambda