Reset to upstream v4.2.8 with select changes #68
Merged
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
This makes it so that when a user reports an account and selects "I don't like it", instead of getting a message about how they should personally block that person, it sends them to the normal reporting interface and they can file their report. Fixes mastodon#1202 Signed-off-by: Robert Helmer <rhelmer@mozilla.com>
remove "Create account" signup button
Make the "I don't like it" category let you report an account
This makes it so that when a user reports an account and selects "I don't like it", instead of getting a message about how they should personally block that person, it sends them to the normal reporting interface and they can file their report. Fixes mastodon#1202 Signed-off-by: Robert Helmer <rhelmer@mozilla.com>
direct user to homepage after logout/sign-out
MZTDN-100 - followup to add dislike as report category
This reverts commit 97d35d1.
This reverts commit b06e34c.
Revert mztdn 100
This reverts commit b06e34c.
This reverts commit 97d35d1.
Mztdn 89/remove mobile sign up button
add OIDC issuer to form-action CSP directive
Merge v4.2.7
Delete attachment async when the admin status API is triggered
differentiate envs for better Sentry logging
Merge v4.2.8
Delete attachment async when the admin status API is triggered - comm…
toufali
force-pushed
the
upstream-v4.2.8-main-changes
branch
from
aa422b0
to
62ebd46
Compare
toufali
force-pushed
the
upstream-v4.2.8-main-changes
branch
from
62ebd46
to
e759917
Compare
|
I've done a first pass at reverting the more obvious stuff (code format, etc). |
toufali
commented
Feb 28, 2024
toufali
commented
Feb 28, 2024
toufali
commented
Feb 28, 2024
toufali
commented
Feb 29, 2024
Comment on lines
90
to
94
| if ENV['OMNIAUTH_ONLY'] == 'true' && ENV['OIDC_ENABLED'] == 'true' | ||
| '/auth/auth/openid_connect/logout' | ||
| else | ||
| new_user_session_path | ||
| end |
There was a problem hiding this comment.
TODO: reverting this means we need to elegantly handle the logout route sent to OIDC service, else user contends with additional OIDC sign-out flow and doesn't redirect back to Mastodon
aaga
approved these changes
Feb 29, 2024
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.
The base branch
upstream-v4.2.8is identical to the upstream branch atv4.2.8.The branch being pulled,
upstream-v4.2.8-main-changesis based offmain. It should include all the changes we intend to keep with our fork. It should be reviewed and unnecessary changes should be identified and removed.After merging this PR, the base branch (
upstream-v4.2.8) should be merged tomain. Our main branch should then be as close to upstream as possible with our required additions.