-
Notifications
You must be signed in to change notification settings - Fork 4
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.
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
chore(sync fork): [SOCPLAT-34] Merge Mastodon v4.2.3 #56
Conversation
…rforming a custom action (mastodon#27442)
…for remote accounts (mastodon#27459)
…rted into timelines (mastodon#27653)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
ready(() => { | ||
const form = document.querySelector('#sso_form') | ||
form.insertAdjacentHTML('beforeend', '<h4>Redirecting...</h4>') | ||
form.elements['commit'].style.setProperty('visibility', 'hidden') | ||
form.elements['intent'].value = localStorage.getItem('mozsoc.auth_intent') | ||
form.elements.commit.style.setProperty('visibility', 'hidden') | ||
form.elements.intent.value = localStorage.getItem('mozsoc.auth_intent') | ||
localStorage.removeItem('mozsoc.auth_intent'); | ||
form.submit(); | ||
}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The linter required a change to the dot notation here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for calling this out – should be fine for this case 🙏
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! Thanks @nina-py 💪
A new PR to follow a rapid release of another patch version.
Note: no merge conflicts whatsoever this time. This release fixes a number of bugs - mostly frontend; Ruby updates don't conflict with any of our changes.
A notable difference is in the number of checks: they're up from 60 per pull request to 71. Linter checks in particular have been split into several, e.g. CSS/JavaScript/Ruby/YML are all being checked separately which speeds up the waiting time. Some of these linting checks were failing on our code changes - all fixed now.
JIRA reference: https://mozilla-hub.atlassian.net/browse/SOCPLAT-34