Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df #2406
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…face (mastodon#26724) Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Jeong Arm <kjwonmail@gmail.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.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>
ClearlyClaire
force-pushed
the
glitch-soc/merge-upstream
branch
from
ec5341d to
526f457
Compare
…oc/merge-upstream
…n search popout Port 9c1ef83 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream
Port 1f141f6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…b UI Port f3a2e15 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…eb UI Port 91040da to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 9b2bc3d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream Conflicts: - `config/initializers/content_security_policy.rb`: Upstream added some code to add the Identity Provider's sign-in endpoint to the `form-action` Content Security Policy directive but our version of the file is pretty different. Ported the change.
Port d2cfcdd to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…er login Port 520b570 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…oc/merge-upstream
…oc/merge-upstream Conflicts: - `.github/workflows/build-nightly.yml`: Upstream modified this file close to a line modified by glitch-soc to disable the ARMv64 builder (as glitch-soc doesn't have one). Ported upstream's changes. - `.github/workflows/build-releases.yml`: Upstream modified this file close to lines changed by glitch-soc to change the Docker image repositories used (only ghcr, and based on the organization's name). Ported upstream's changes.
Port 2a4fcc5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Plastikmensch
approved these changes
Sep 16, 2023
There was a problem hiding this comment.
Ah, missed that while triaging but I don't like that 5d20733
also changes the background for the notification bar and tabs on account pages:
Before:
After:
I can't tell if that's an oversight or on purpose though, it just looks off to me.
Just wanted to note that, otherwise the changes look good to me.
|
This is a change made on purpose upstream, but I do agree this makes tabs more difficult to visually distinguish from the contents. |
|
Reverted the background color |
ClearlyClaire
changed the title
|
Thank you! |
|
Ah, sorry, I usually don't check locales, but upstream has removed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2405
Merge upstream changes up to 548c032
Conflicts
None
Ported changes
Merge upstream changes up to 93d051e
Conflicts
None
Ported changes
Postponed changes
Merge upstream changes up to 398635c
Conflicts
None
Ported changes
Skipped changes
Merge upstream changes up to b1d8907
Conflicts
None
Ported changes
Merge upstream changes up to 97e4011
Conflicts
config/initializers/content_security_policy.rb:Upstream added some code to add the Identity Provider's sign-in endpoint to the
form-actionContent Security Policy directive but our version of the file is pretty different.Ported the change.
Ported changes
Postponed changes (see #2408)
Merge upstream changes up to b90383d (v4.2.0-rc1)
No conflicts and nothing to port
Merge upstream changes up to 6273416
Conflicts
.github/workflows/build-nightly.yml:Upstream modified this file close to a line modified by glitch-soc to disable the ARMv64 builder (as glitch-soc doesn't have one).
Ported upstream's changes.
.github/workflows/build-releases.yml:Upstream modified this file close to lines changed by glitch-soc to change the Docker image repositories used (only ghcr, and based on the organization's name).
Ported upstream's changes.
Ported changes
Additional changes