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 #2192

Merged
merged 31 commits into from
Apr 22, 2023
Merged

Merge upstream changes #2192

merged 31 commits into from
Apr 22, 2023

Conversation

ClearlyClaire
Copy link

@ClearlyClaire ClearlyClaire commented Apr 22, 2023 •
edited
Loading

Conflicts

  • app/controllers/auth/setup_controller.rb:
    Upstream removed a method close to a glitch-soc theming-related method.
    Removed the method like upstream did.

Ported changes

  • d02aa27 (kinda): only one occurrence of collapsable was present in glitch-soc, which was obviously a mistake; I did not investigate as to whether the corresponding collapsible prop actually existed, though, I just applied the change
  • f05fb51
  • e5c0b16 (SCSS changes)
  • bc4745f
  • 955ec25
  • cf3fa1e
  • ab740f4

Postponed

  • 9f8d346 sounds like a good change, but glitch-soc's component is different; I haven't investigated how much of that is intentional change and how much is having missed upstream changes

nschonni and others added 29 commits April 14, 2023 11:01
@nschonni
typo: collapsable -> collapsible (mastodon#24521)
d02aa27
@danielmbrasil
tootctl: add --approve option to tootctl accounts create (mastodon#24533
b0800d6 
)
@mjankowski
Refactor race condition reblog service spec (mastodon#24526)
10f0de4
Fix status title for statuses without text (mastodon#24359)
f05fb51
@Gargron
Add client-side validation for taken username in sign-up form (mastod…
955ec25 
…on#24546)
@Gargron
Add progress indicator to sign-up flow (mastodon#24545)
e5c0b16
@takayamaki
Rewrite GIFV component with React hooks (mastodon#24552)
cf3fa1e
@takayamaki
Rewrite AvatarOverlay component with React hooks (mastodon#24543)
9f8d346
@nschonni
Update Jest testing to include Typescript (mastodon#24555)
ca447d3
@ClearlyClaire
Fix crash when trying to open the filter modal (mastodon#24556)
bc4745f
@HeitorMC @luccamps
@negreirosleo @marcioflaviof @joaoGabriel55
Add user handle to notification mail recipient address (mastodon#24240)
4601e0d 
Co-authored-by: luccamps <[email protected]>
Co-authored-by: Leonardo Negreiros de Oliveira <[email protected]>
Co-authored-by: Marcio Flavio <[email protected]>
Co-authored-by: Gabriel Quaresma <[email protected]>
@ClearlyClaire
Fix crash in NotifyService when trying to send an email notification …
85b1b45 
…for polls (mastodon#24558)
@takayamaki
Rewrite AnimatedNumber component with React hooks (mastodon#24559)
ab740f4
@HeitorMC
Change moderation search an account using the username with @ (mastod…
bc75e62 
…on#24242)
@danielmbrasil
Fix email confirmation skip option in `tootctl accounts modify USERNA…
3afa1fd 
…ME --email EMAIL --confirm` (mastodon#24578)
@dependabot
Bump ox from 2.14.14 to 2.14.16 (mastodon#24577)
10ef3d9 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump http-link-header from 1.1.0 to 1.1.1 (mastodon#24575)
a5e9128 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump pghero from 3.3.1 to 3.3.2 (mastodon#24572)
88ef71e 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump json-ld from 3.2.3 to 3.2.4 (mastodon#24571)
2c72396 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump postcss from 8.4.21 to 8.4.22 (mastodon#24570)
fe1ac6b 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump reselect from 4.1.7 to 4.1.8 (mastodon#24565)
426e3cc 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump faker from 3.1.1 to 3.2.0 (mastodon#24579)
1153531 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@rrgeorge
Add trend management to admin API (mastodon#24257)
4db8230
@ClearlyClaire
Merge branch 'main' into glitch-soc/merge-upstream
abfdafe 
Conflicts:
- `app/controllers/auth/setup_controller.rb`:
  Upstream removed a method close to a glitch-soc theming-related method.
  Removed the method like upstream did.
@nschonni @ClearlyClaire
[Glitch] typo: collapsable -> collapsible
f279727 
Port d02aa27 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix status title for statuses without text
a21a875 
Port f05fb51 to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Add progress indicator to sign-up flow
2f3dffb 
Port e5c0b16 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire
[Glitch] Fix crash when trying to open the filter modal
bc7b339 
Port bc4745f to glitch-soc

Signed-off-by: Claire <[email protected]>
@Gargron @ClearlyClaire
[Glitch] Add client-side validation for taken username in sign-up form
6ea9137 
Port 955ec25 to glitch-soc

Signed-off-by: Claire <[email protected]>
@ClearlyClaire ClearlyClaire changed the title Glitch soc/merge upstream Merge upstream changes Apr 22, 2023
@ClearlyClaire ClearlyClaire marked this pull request as ready for review April 22, 2023 11:20
Plastikmensch
Plastikmensch approved these changes Apr 22, 2023
View reviewed changes
Copy link

@Plastikmensch Plastikmensch left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Of note: 955ec25 causes Failed to load resource: the server responded with a status of 404 (Not Found) to be logged to console when entering an unused username.

bc7b339 Closes #2186

@ClearlyClaire ClearlyClaire merged commit 2ebbfeb into glitch-soc:main Apr 22, 2023
@ClearlyClaire ClearlyClaire mentioned this pull request Apr 22, 2023
Closed
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.
9 participants
@ClearlyClaire @Plastikmensch @nschonni @danielmbrasil @mjankowski @Gargron @takayamaki @HeitorMC @rrgeorge