diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f4d40229d3353b..222412dd8e0e4a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -34,7 +34,6 @@ class ApplicationController < ActionController::Base
   helper_method :limited_federation_mode?
   helper_method :body_class_string
   helper_method :skip_csrf_meta_tags?
-  helper_method :sso_redirect
 
   rescue_from ActionController::ParameterMissing, Paperclip::AdapterRegistry::NoHandlerError, with: :bad_request
   rescue_from Mastodon::NotPermittedError, with: :forbidden
@@ -88,7 +87,11 @@ def skip_csrf_meta_tags?
   end
 
   def after_sign_out_path_for(_resource_or_scope)
-    root_path
+    if ENV['OMNIAUTH_ONLY'] == 'true' && ENV['OIDC_ENABLED'] == 'true'
+      '/auth/auth/openid_connect/logout'
+    else
+      new_user_session_path
+    end
   end
 
   protected
@@ -145,10 +148,6 @@ def omniauth_only?
     ENV['OMNIAUTH_ONLY'] == 'true'
   end
 
-  def sso_redirect
-    "/auth/auth/#{Devise.omniauth_providers[0]}" if ENV['OMNIAUTH_ONLY'] == 'true' && Devise.omniauth_providers.length == 1
-  end
-
   def sso_account_settings
     ENV.fetch('SSO_ACCOUNT_SETTINGS', nil)
   end
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index d593ad98fa0337..8212e2e630ba31 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -11,9 +11,6 @@ class Auth::SessionsController < Devise::SessionsController
   skip_before_action :require_functional!
   skip_before_action :update_user_sign_in
 
-  # Allow any client to call /auth/sign_out via a delete call
-  skip_before_action :verify_authenticity_token, only: [:destroy]
-
   prepend_before_action :check_suspicious!, only: [:create]
 
   include TwoFactorAuthenticationConcern
diff --git a/app/javascript/mastodon/components/column_back_button.jsx b/app/javascript/mastodon/components/column_back_button.jsx
index 8d0f25d95e7ddf..74a03b093ab8cc 100644
--- a/app/javascript/mastodon/components/column_back_button.jsx
+++ b/app/javascript/mastodon/components/column_back_button.jsx
@@ -4,7 +4,7 @@ import { createPortal } from 'react-dom';
 
 import { FormattedMessage } from 'react-intl';
 
-import { Icon } from 'mastodon/components/icon';
+import { Icon }  from 'mastodon/components/icon';
 
 export default class ColumnBackButton extends PureComponent {
 
@@ -30,7 +30,7 @@ export default class ColumnBackButton extends PureComponent {
     }
   };
 
-  render() {
+  render () {
     const { multiColumn } = this.props;
 
     const component = (
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index f2bba3bdcbee6d..7a7cd9880f0325 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -77,7 +77,7 @@ const makeMapStateToProps = () => {
 
 const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
 
-  onReply(status, router) {
+  onReply (status, router) {
     dispatch((_, getState) => {
       let state = getState();
 
@@ -87,8 +87,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
           modalProps: {
             message: intl.formatMessage(messages.replyMessage),
             confirm: intl.formatMessage(messages.replyConfirm),
-            onConfirm: () => dispatch(replyCompose(status, router))
-          },
+            onConfirm: () => dispatch(replyCompose(status, router)) },
         }));
       } else {
         dispatch(replyCompose(status, router));
@@ -96,7 +95,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     });
   },
 
-  onModalReblog(status, privacy) {
+  onModalReblog (status, privacy) {
     if (status.get('reblogged')) {
       dispatch(unreblog(status));
     } else {
@@ -104,7 +103,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onReblog(status, e) {
+  onReblog (status, e) {
     if ((e && e.shiftKey) || !boostModal) {
       this.onModalReblog(status);
     } else {
@@ -112,7 +111,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onFavourite(status) {
+  onFavourite (status) {
     if (status.get('favourited')) {
       dispatch(unfavourite(status));
     } else {
@@ -120,7 +119,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onBookmark(status) {
+  onBookmark (status) {
     if (status.get('bookmarked')) {
       dispatch(unbookmark(status));
     } else {
@@ -128,7 +127,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onPin(status) {
+  onPin (status) {
     if (status.get('pinned')) {
       dispatch(unpin(status));
     } else {
@@ -136,7 +135,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onEmbed(status) {
+  onEmbed (status) {
     dispatch(openModal({
       modalType: 'EMBED',
       modalProps: {
@@ -146,7 +145,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }));
   },
 
-  onDelete(status, history, withRedraft = false) {
+  onDelete (status, history, withRedraft = false) {
     if (!deleteModal) {
       dispatch(deleteStatus(status.get('id'), history, withRedraft));
     } else {
@@ -161,7 +160,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onEdit(status, history) {
+  onEdit (status, history) {
     dispatch((_, getState) => {
       let state = getState();
       if (state.getIn(['compose', 'text']).trim().length !== 0) {
@@ -179,7 +178,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     });
   },
 
-  onTranslate(status) {
+  onTranslate (status) {
     if (status.get('translation')) {
       dispatch(undoStatusTranslation(status.get('id'), status.get('poll')));
     } else {
@@ -187,54 +186,54 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onDirect(account, router) {
+  onDirect (account, router) {
     dispatch(directCompose(account, router));
   },
 
-  onMention(account, router) {
+  onMention (account, router) {
     dispatch(mentionCompose(account, router));
   },
 
-  onOpenMedia(statusId, media, index, lang) {
+  onOpenMedia (statusId, media, index, lang) {
     dispatch(openModal({
       modalType: 'MEDIA',
       modalProps: { statusId, media, index, lang },
     }));
   },
 
-  onOpenVideo(statusId, media, lang, options) {
+  onOpenVideo (statusId, media, lang, options) {
     dispatch(openModal({
       modalType: 'VIDEO',
       modalProps: { statusId, media, lang, options },
     }));
   },
 
-  onBlock(status) {
+  onBlock (status) {
     const account = status.get('account');
     dispatch(initBlockModal(account));
   },
 
-  onUnblock(account) {
+  onUnblock (account) {
     dispatch(unblockAccount(account.get('id')));
   },
 
-  onReport(status) {
+  onReport (status) {
     dispatch(initReport(status.get('account'), status));
   },
 
-  onAddFilter(status) {
+  onAddFilter (status) {
     dispatch(initAddFilter(status, { contextType }));
   },
 
-  onMute(account) {
+  onMute (account) {
     dispatch(initMuteModal(account));
   },
 
-  onUnmute(account) {
+  onUnmute (account) {
     dispatch(unmuteAccount(account.get('id')));
   },
 
-  onMuteConversation(status) {
+  onMuteConversation (status) {
     if (status.get('muted')) {
       dispatch(unmuteStatus(status.get('id')));
     } else {
@@ -242,7 +241,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onToggleHidden(status) {
+  onToggleHidden (status) {
     if (status.get('hidden')) {
       dispatch(revealStatus(status.get('id')));
     } else {
@@ -250,11 +249,11 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }
   },
 
-  onToggleCollapsed(status, isCollapsed) {
+  onToggleCollapsed (status, isCollapsed) {
     dispatch(toggleStatusCollapse(status.get('id'), isCollapsed));
   },
 
-  onBlockDomain(domain) {
+  onBlockDomain (domain) {
     dispatch(openModal({
       modalType: 'CONFIRM',
       modalProps: {
@@ -265,15 +264,15 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
     }));
   },
 
-  onUnblockDomain(domain) {
+  onUnblockDomain (domain) {
     dispatch(unblockDomain(domain));
   },
 
-  deployPictureInPicture(status, type, mediaProps) {
+  deployPictureInPicture (status, type, mediaProps) {
     dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
   },
 
-  onInteractionModal(type, status) {
+  onInteractionModal (type, status) {
     dispatch(openModal({
       modalType: 'INTERACTION',
       modalProps: {
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
index 672a5bc293e100..13d1c2e1a7cd97 100644
--- a/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.jsx
@@ -48,7 +48,7 @@ class LanguageDropdownMenu extends PureComponent {
     }
   };
 
-  componentDidMount() {
+  componentDidMount () {
     document.addEventListener('click', this.handleDocumentClick, { capture: true });
     document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
 
@@ -62,7 +62,7 @@ class LanguageDropdownMenu extends PureComponent {
     });
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     document.removeEventListener('click', this.handleDocumentClick, { capture: true });
     document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
   }
@@ -79,7 +79,7 @@ class LanguageDropdownMenu extends PureComponent {
     this.setState({ searchValue: target.value });
   };
 
-  search() {
+  search () {
     const { languages, value, frequentlyUsedLanguages } = this.props;
     const { searchValue } = this.state;
 
@@ -109,7 +109,7 @@ class LanguageDropdownMenu extends PureComponent {
     }).map(result => result.obj);
   }
 
-  frequentlyUsed() {
+  frequentlyUsed () {
     const { languages, value } = this.props;
     const current = languages.find(lang => lang[0] === value);
     const results = [];
@@ -136,32 +136,32 @@ class LanguageDropdownMenu extends PureComponent {
 
     let element = null;
 
-    switch (e.key) {
-      case 'Escape':
-        onClose();
-        break;
-      case 'Enter':
-        this.handleClick(e);
-        break;
-      case 'ArrowDown':
-        element = this.listNode.childNodes[index + 1] || this.listNode.firstChild;
-        break;
-      case 'ArrowUp':
+    switch(e.key) {
+    case 'Escape':
+      onClose();
+      break;
+    case 'Enter':
+      this.handleClick(e);
+      break;
+    case 'ArrowDown':
+      element = this.listNode.childNodes[index + 1] || this.listNode.firstChild;
+      break;
+    case 'ArrowUp':
+      element = this.listNode.childNodes[index - 1] || this.listNode.lastChild;
+      break;
+    case 'Tab':
+      if (e.shiftKey) {
         element = this.listNode.childNodes[index - 1] || this.listNode.lastChild;
-        break;
-      case 'Tab':
-        if (e.shiftKey) {
-          element = this.listNode.childNodes[index - 1] || this.listNode.lastChild;
-        } else {
-          element = this.listNode.childNodes[index + 1] || this.listNode.firstChild;
-        }
-        break;
-      case 'Home':
-        element = this.listNode.firstChild;
-        break;
-      case 'End':
-        element = this.listNode.lastChild;
-        break;
+      } else {
+        element = this.listNode.childNodes[index + 1] || this.listNode.firstChild;
+      }
+      break;
+    case 'Home':
+      element = this.listNode.firstChild;
+      break;
+    case 'End':
+      element = this.listNode.lastChild;
+      break;
     }
 
     if (element) {
@@ -177,33 +177,33 @@ class LanguageDropdownMenu extends PureComponent {
 
     let element = null;
 
-    switch (e.key) {
-      case 'Tab':
-      case 'ArrowDown':
-        element = this.listNode.firstChild;
+    switch(e.key) {
+    case 'Tab':
+    case 'ArrowDown':
+      element = this.listNode.firstChild;
 
-        if (element) {
-          element.focus();
-          e.preventDefault();
-          e.stopPropagation();
-        }
+      if (element) {
+        element.focus();
+        e.preventDefault();
+        e.stopPropagation();
+      }
 
-        break;
-      case 'Enter':
-        element = this.listNode.firstChild;
+      break;
+    case 'Enter':
+      element = this.listNode.firstChild;
 
-        if (element) {
-          onChange(element.getAttribute('data-index'));
-          onClose();
-        }
-        break;
-      case 'Escape':
-        if (searchValue !== '') {
-          e.preventDefault();
-          this.handleClear();
-        }
+      if (element) {
+        onChange(element.getAttribute('data-index'));
+        onClose();
+      }
+      break;
+    case 'Escape':
+      if (searchValue !== '') {
+        e.preventDefault();
+        this.handleClear();
+      }
 
-        break;
+      break;
     }
   };
 
@@ -221,7 +221,7 @@ class LanguageDropdownMenu extends PureComponent {
     );
   };
 
-  render() {
+  render () {
     const { intl } = this.props;
     const { searchValue } = this.state;
     const isSearching = searchValue !== '';
@@ -294,7 +294,7 @@ class LanguageDropdown extends PureComponent {
     this.setState({ placement: state.placement });
   };
 
-  render() {
+  render () {
     const { value, intl, frequentlyUsedLanguages } = this.props;
     const { open, placement } = this.state;
 
diff --git a/app/javascript/mastodon/features/interaction_modal/index.jsx b/app/javascript/mastodon/features/interaction_modal/index.jsx
index 6971eacaf7d7be..2a9fa0e33ef943 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.jsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.jsx
@@ -12,7 +12,7 @@ import { throttle, escapeRegExp } from 'lodash';
 import { openModal, closeModal } from 'mastodon/actions/modal';
 import api from 'mastodon/api';
 import Button from 'mastodon/components/button';
-import { Icon } from 'mastodon/components/icon';
+import { Icon }  from 'mastodon/components/icon';
 import { registrationsOpen, sso_redirect } from 'mastodon/initial_state';
 
 const messages = defineMessages({
@@ -21,15 +21,15 @@ const messages = defineMessages({
 
 const mapStateToProps = (state, { accountId }) => ({
   displayNameHtml: state.getIn(['accounts', accountId, 'display_name_html']),
-  signupUrl: state.getIn(['server', 'server', 'registrations', 'url'], null) || '/auth/auth/openid_connect',
+  signupUrl: state.getIn(['server', 'server', 'registrations', 'url'], null) || '/auth/sign_up',
 });
 
 const mapDispatchToProps = (dispatch) => ({
   onSignupClick() {
     dispatch(closeModal({
-      modalType: undefined,
-      ignoreFocus: false,
-    }));
+        modalType: undefined,
+        ignoreFocus: false,
+      }));
     dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' }));
   },
 });
@@ -57,7 +57,7 @@ const valueToDomain = value => {
     } catch {
       return undefined;
     }
-    // If the user writes their full handle including username
+  // If the user writes their full handle including username
   } else if (value.includes('@')) {
     if (value.replace(/^@/, '').split('@').length > 2) {
       return undefined;
@@ -127,7 +127,7 @@ class LoginForm extends React.PureComponent {
     try {
       new URL(url);
       return true;
-    } catch (_) {
+    } catch(_) {
       return false;
     }
   };
@@ -166,11 +166,11 @@ class LoginForm extends React.PureComponent {
     }
   };
 
-  componentDidMount() {
+  componentDidMount () {
     window.addEventListener('message', this.handleMessage);
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     window.removeEventListener('message', this.handleMessage);
   }
 
@@ -200,38 +200,38 @@ class LoginForm extends React.PureComponent {
   handleKeyDown = (e) => {
     const { options, selectedOption } = this.state;
 
-    switch (e.key) {
-      case 'ArrowDown':
-        e.preventDefault();
+    switch(e.key) {
+    case 'ArrowDown':
+      e.preventDefault();
 
-        if (options.length > 0) {
-          this.setState({ selectedOption: Math.min(selectedOption + 1, options.length - 1) });
-        }
+      if (options.length > 0) {
+        this.setState({ selectedOption: Math.min(selectedOption + 1, options.length - 1) });
+      }
 
-        break;
-      case 'ArrowUp':
-        e.preventDefault();
+      break;
+    case 'ArrowUp':
+      e.preventDefault();
 
-        if (options.length > 0) {
-          this.setState({ selectedOption: Math.max(selectedOption - 1, -1) });
-        }
+      if (options.length > 0) {
+        this.setState({ selectedOption: Math.max(selectedOption - 1, -1) });
+      }
 
-        break;
-      case 'Enter':
-        e.preventDefault();
+      break;
+    case 'Enter':
+      e.preventDefault();
 
-        if (selectedOption === -1) {
-          this.handleSubmit();
-        } else if (options.length > 0) {
-          this.setState({ value: options[selectedOption], error: false }, () => this.handleSubmit());
-        }
+      if (selectedOption === -1) {
+        this.handleSubmit();
+      } else if (options.length > 0) {
+        this.setState({ value: options[selectedOption], error: false }, () => this.handleSubmit());
+      }
 
-        break;
+      break;
     }
   };
 
   handleOptionClick = e => {
-    const index = Number(e.currentTarget.getAttribute('data-index'));
+    const index  = Number(e.currentTarget.getAttribute('data-index'));
     const option = this.state.options[index];
 
     e.preventDefault();
@@ -264,7 +264,7 @@ class LoginForm extends React.PureComponent {
     });
   }, 200, { leading: true, trailing: true });
 
-  render() {
+  render () {
     const { intl } = this.props;
     const { value, expanded, options, selectedOption, error, isSubmitting } = this.state;
     const domain = (valueToDomain(value) || '').trim();
@@ -276,7 +276,7 @@ class LoginForm extends React.PureComponent {
 
         <iframe
           ref={this.setIFrameRef}
-          style={{ display: 'none' }}
+          style={{display: 'none'}}
           src='/remote_interaction_helper'
           sandbox='allow-scripts allow-same-origin'
           title='remote interaction helper'
@@ -345,34 +345,34 @@ class InteractionModal extends React.PureComponent {
     this.props.onSignupClick();
   };
 
-  render() {
+  render () {
     const { url, type, displayNameHtml, signupUrl } = this.props;
 
     const name = <bdi dangerouslySetInnerHTML={{ __html: displayNameHtml }} />;
 
     let title, actionDescription, icon;
 
-    switch (type) {
-      case 'reply':
-        icon = <Icon id='reply' />;
-        title = <FormattedMessage id='interaction_modal.title.reply' defaultMessage="Reply to {name}'s post" values={{ name }} />;
-        actionDescription = <FormattedMessage id='interaction_modal.description.reply' defaultMessage='With an account on Mastodon, you can respond to this post.' />;
-        break;
-      case 'reblog':
-        icon = <Icon id='retweet' />;
-        title = <FormattedMessage id='interaction_modal.title.reblog' defaultMessage="Boost {name}'s post" values={{ name }} />;
-        actionDescription = <FormattedMessage id='interaction_modal.description.reblog' defaultMessage='With an account on Mastodon, you can boost this post to share it with your own followers.' />;
-        break;
-      case 'favourite':
-        icon = <Icon id='star' />;
-        title = <FormattedMessage id='interaction_modal.title.favourite' defaultMessage="Favorite {name}'s post" values={{ name }} />;
-        actionDescription = <FormattedMessage id='interaction_modal.description.favourite' defaultMessage='With an account on Mastodon, you can favorite this post to let the author know you appreciate it and save it for later.' />;
-        break;
-      case 'follow':
-        icon = <Icon id='user-plus' />;
-        title = <FormattedMessage id='interaction_modal.title.follow' defaultMessage='Follow {name}' values={{ name }} />;
-        actionDescription = <FormattedMessage id='interaction_modal.description.follow' defaultMessage='With an account on Mastodon, you can follow {name} to receive their posts in your home feed.' values={{ name }} />;
-        break;
+    switch(type) {
+    case 'reply':
+      icon = <Icon id='reply' />;
+      title = <FormattedMessage id='interaction_modal.title.reply' defaultMessage="Reply to {name}'s post" values={{ name }} />;
+      actionDescription = <FormattedMessage id='interaction_modal.description.reply' defaultMessage='With an account on Mastodon, you can respond to this post.' />;
+      break;
+    case 'reblog':
+      icon = <Icon id='retweet' />;
+      title = <FormattedMessage id='interaction_modal.title.reblog' defaultMessage="Boost {name}'s post" values={{ name }} />;
+      actionDescription = <FormattedMessage id='interaction_modal.description.reblog' defaultMessage='With an account on Mastodon, you can boost this post to share it with your own followers.' />;
+      break;
+    case 'favourite':
+      icon = <Icon id='star' />;
+      title = <FormattedMessage id='interaction_modal.title.favourite' defaultMessage="Favorite {name}'s post" values={{ name }} />;
+      actionDescription = <FormattedMessage id='interaction_modal.description.favourite' defaultMessage='With an account on Mastodon, you can favorite this post to let the author know you appreciate it and save it for later.' />;
+      break;
+    case 'follow':
+      icon = <Icon id='user-plus' />;
+      title = <FormattedMessage id='interaction_modal.title.follow' defaultMessage='Follow {name}' values={{ name }} />;
+      actionDescription = <FormattedMessage id='interaction_modal.description.follow' defaultMessage='With an account on Mastodon, you can follow {name} to receive their posts in your home feed.' values={{ name }} />;
+      break;
     }
 
     let signupButton;
@@ -388,7 +388,7 @@ class InteractionModal extends React.PureComponent {
         <a href={signupUrl} className='link-button'>
           <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
         </a>
-      )
+      );
     } else {
       signupButton = (
         <button className='link-button' onClick={this.handleSignupClick}>
diff --git a/app/javascript/mastodon/features/ui/components/header.jsx b/app/javascript/mastodon/features/ui/components/header.jsx
index 240291ec73a5ca..68484b59ab0f5e 100644
--- a/app/javascript/mastodon/features/ui/components/header.jsx
+++ b/app/javascript/mastodon/features/ui/components/header.jsx
@@ -27,7 +27,7 @@ const messages = defineMessages({
 });
 
 const mapStateToProps = (state) => ({
-  signupUrl: state.getIn(['server', 'server', 'registrations', 'url'], null) || '/auth/auth/openid_connect',
+  signupUrl: state.getIn(['server', 'server', 'registrations', 'url'], null) || '/auth/sign_up',
 });
 
 const mapDispatchToProps = (dispatch) => ({
diff --git a/app/javascript/mastodon/features/ui/components/link_footer.jsx b/app/javascript/mastodon/features/ui/components/link_footer.jsx
index c67ec83b249be4..5fa370a82219ea 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.jsx
+++ b/app/javascript/mastodon/features/ui/components/link_footer.jsx
@@ -18,7 +18,7 @@ const messages = defineMessages({
 });
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
-  onLogout() {
+  onLogout () {
     dispatch(openModal({
       modalType: 'CONFIRM',
       modalProps: {
@@ -52,7 +52,7 @@ class LinkFooter extends PureComponent {
     return false;
   };
 
-  render() {
+  render () {
     const { signedIn, permissions } = this.context.identity;
     const { multiColumn } = this.props;
 
diff --git a/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx b/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
index b50ca0ed643f3c..d5f0c00dca70df 100644
--- a/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
+++ b/app/javascript/mastodon/features/ui/components/sign_in_banner.jsx
@@ -28,23 +28,11 @@ const SignInBanner = () => {
     )
   }
 
-  if (sso_redirect) {
-    return (
-      <div className='sign-in-banner'>
-        <p><FormattedMessage id='sign_in_banner.text' defaultMessage='Login to follow profiles or hashtags, favorite, share and reply to posts. You can also interact from your account on a different server.' /></p>
-        <a href={sso_redirect} data-method='post' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sso_redirect' defaultMessage='Login or Register' /></a>
-      </div>
-    )
-  }
-
   if (registrationsOpen) {
     signupButton = (
-      <form action={signupUrl} method='post'>
-        <input type='hidden' name='intent' value='signup' />
-        <button className='button button--block'>
-          <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
-        </button>
-      </form>
+      <a href={signupUrl} className='button button--block'>
+        <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
+      </a>
     );
   } else {
     signupButton = (
@@ -58,7 +46,7 @@ const SignInBanner = () => {
     <div className='sign-in-banner'>
       <p><FormattedMessage id='sign_in_banner.text' defaultMessage='Login to follow profiles or hashtags, favorite, share and reply to posts. You can also interact from your account on a different server.' /></p>
       {signupButton}
-      <a href='/auth/auth/openid_connect' rel='nofollow' className='button button--block button-tertiary' data-method='post'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Sign in' /></a>
+      <a href='/auth/sign_in' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a>
     </div>
   );
 };
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 9e39bb42508c75..4399b999513363 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -726,4 +726,4 @@
   "video.pause": "Pause",
   "video.play": "Play",
   "video.unmute": "Unmute sound"
-}
\ No newline at end of file
+}
diff --git a/app/javascript/packs/auto_redirect_sign-in.js b/app/javascript/packs/auto_redirect_sign-in.js
deleted file mode 100644
index 0310e1d1a0aeba..00000000000000
--- a/app/javascript/packs/auto_redirect_sign-in.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import ready from '../mastodon/ready';
-
-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')
-  localStorage.removeItem('mozsoc.auth_intent');
-  form.submit();
-});
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 780ce96b5e4877..a65f35e7b135bb 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1358,7 +1358,7 @@ a.sparkline {
     }
   }
 
-  @media screen and (width <=930px) {
+  @media screen and (width <= 930px) {
     grid-template-columns: minmax(0, 1fr);
   }
 }
@@ -1644,7 +1644,7 @@ a.sparkline {
     }
   }
 
-  @media screen and (width <=800px) {
+  @media screen and (width <= 800px) {
     border: 0;
 
     &__item {
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index dadeff30acf6e4..3d646da2391364 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -18,6 +18,7 @@
 
     .logo {
       height: 42px;
+      margin-inline-end: 10px;
     }
 
     a {
diff --git a/app/models/status.rb b/app/models/status.rb
index e1594bdd1784e2..37c6fab47921c3 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -256,6 +256,8 @@ def non_sensitive_with_media?
   end
 
   def reported?
+    # diverged from upstream: status.reported? should be true even if the report against the Status is already resolved
+    # https://github.com/mastodon/mastodon/pull/27675/files#r1382155905
     @reported ||= Report.where(target_account: account).where('? = ANY(status_ids)', id).exists?
   end
 
diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml
index d130177c1006d3..7914e0157fab5b 100644
--- a/app/views/auth/sessions/new.html.haml
+++ b/app/views/auth/sessions/new.html.haml
@@ -21,9 +21,10 @@
 
 - if devise_mapping.omniauthable? && resource_class.omniauth_providers.any?
   .simple_form.alternative-login
-    = javascript_pack_tag 'auto_redirect_sign-in', crossorigin: 'anonymous'
-    = form_tag(sso_redirect, id: 'sso_form') do
-      = hidden_field_tag 'intent'
-      = submit_tag(t('auth.login'), class: 'button button--block')
-- else
-  .form-footer= render 'auth/shared/links'
+    %h4= omniauth_only? ? t('auth.log_in_with') : t('auth.or_log_in_with')
+
+    .actions
+      - resource_class.omniauth_providers.each do |provider|
+        = provider_sign_in_link(provider)
+
+.form-footer= render 'auth/shared/links'
diff --git a/config/environments/production.rb b/config/environments/production.rb
index b404e7f1b88c93..4d80a66af6e76f 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -72,7 +72,7 @@
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # English when a translation cannot be found).
-  config.i18n.fallbacks = true
+  config.i18n.fallbacks = [:en]
 
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
diff --git a/config/initializers/3_omniauth.rb b/config/initializers/3_omniauth.rb
index 7bef38ab94740b..7520f09e5e64be 100644
--- a/config/initializers/3_omniauth.rb
+++ b/config/initializers/3_omniauth.rb
@@ -6,14 +6,6 @@
 
 Rails.application.config.middleware.use OmniAuth::Builder do
   # Vanilla omniauth strategies
-  before_request_phase do |env|
-    request = Rack::Request.new(env)
-    env['omniauth.strategy'].options.merge!(
-      {
-        extra_authorize_params: request.params,
-      }
-    )
-  end
 end
 
 Devise.setup do |config|
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 6729e63cd0da3a..3f24b15077d3a8 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -176,10 +176,8 @@
   # Under some circumstances you might want to have applications auto-approved,
   # so that the user skips the authorization step.
   # For example if dealing with a trusted application.
-  redirect_uri_whitelist = ENV['REDIRECT_URI_WHITELIST']&.split('|').freeze
-
   skip_authorization do |resource_owner, client|
-    client.application.superapp? || redirect_uri_whitelist&.include?(client.application.redirect_uri)
+    client.application.superapp?
   end
 
   # WWW-Authenticate Realm (default "Doorkeeper").
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 77d9ba9a83b3bc..6177b7a25a6d02 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -29,15 +29,15 @@
     end
 
     it 'does not match URLs with hashtag-like anchors' do
-      expect(subject.match('https://en\.wikipedia\.org/wiki/Ghostbusters_(song)#Lawsuit')).to be_nil
+      expect(subject.match('https://en.wikipedia.org/wiki/Ghostbusters_(song)#Lawsuit')).to be_nil
     end
 
     it 'does not match URLs with hashtag-like anchors after a numeral' do
-      expect(subject.match('https://gcc\.gnu\.org/bugzilla/show_bug.cgi?id=111895#c4')).to be_nil
+      expect(subject.match('https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111895#c4')).to be_nil
     end
 
     it 'does not match URLs with hashtag-like anchors after an empty query parameter' do
-      expect(subject.match('https://en\.wikipedia\.org/wiki/Ghostbusters_(song)?foo=#Lawsuit')).to be_nil
+      expect(subject.match('https://en.wikipedia.org/wiki/Ghostbusters_(song)?foo=#Lawsuit')).to be_nil
     end
 
     it 'matches #ａｅｓｔｈｅｔｉｃ' do