From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 17 Feb 2022 09:58:25 +0000 (+0100)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f224237862b009ad4b008a8730c58111f103145b;p=mastodon.git

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
---

f224237862b009ad4b008a8730c58111f103145b
diff --cc .github/workflows/build-image.yml
index 5b7f2481e,92a164c40..2d1df7211
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@@ -31,7 -34,7 +35,7 @@@ jobs
          with:
            context: .
            platforms: linux/amd64,linux/arm64
-           push: true
+           push: ${{ github.event_name != 'pull_request' }}
            tags: ${{ steps.meta.outputs.tags }}
 -          cache-from: type=registry,ref=tootsuite/mastodon:latest
 +          cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/mastodon:latest
            cache-to: type=inline
diff --cc app/controllers/auth/registrations_controller.rb
index 6b1f3fa82,3b025838b..5d32fe66e
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@@ -8,8 -8,8 +8,9 @@@ class Auth::RegistrationsController < D
    before_action :set_invite, only: [:new, :create]
    before_action :check_enabled_registrations, only: [:new, :create]
    before_action :configure_sign_up_params, only: [:create]
 +  before_action :set_pack
    before_action :set_sessions, only: [:edit, :update]
+   before_action :set_strikes, only: [:edit, :update]
    before_action :set_instance_presenter, only: [:new, :create, :update]
    before_action :set_body_classes, only: [:new, :create, :edit, :update]
    before_action :require_not_suspended!, only: [:update]
diff --cc app/javascript/packs/public.js
index 7ebe8b4d0,3d0a937e1..be467a8e2
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@@ -150,14 -167,116 +150,8 @@@ function main() 
      });
    });
  
 -  delegate(document, '.webapp-btn', 'click', ({ target, button }) => {
 -    if (button !== 0) {
 -      return true;
 -    }
 -    window.location.href = target.href;
 -    return false;
 -  });
 -
 -  delegate(document, '.modal-button', 'click', e => {
 -    e.preventDefault();
 -
 -    let href;
 -
 -    if (e.target.nodeName !== 'A') {
 -      href = e.target.parentNode.href;
 -    } else {
 -      href = e.target.href;
 -    }
 -
 -    window.open(href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
 -  });
 -
 -  delegate(document, '#account_display_name', 'input', ({ target }) => {
 -    const name = document.querySelector('.card .display-name strong');
 -    if (name) {
 -      if (target.value) {
 -        name.innerHTML = emojify(escapeTextContentForBrowser(target.value));
 -      } else {
 -        name.textContent = target.dataset.default;
 -      }
 -    }
 -  });
 -
 -  delegate(document, '#account_avatar', 'change', ({ target }) => {
 -    const avatar = document.querySelector('.card .avatar img');
 -    const [file] = target.files || [];
 -    const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc;
 -
 -    avatar.src = url;
 -  });
 -
 -  const getProfileAvatarAnimationHandler = (swapTo) => {
 -    //animate avatar gifs on the profile page when moused over
 -    return ({ target }) => {
 -      const swapSrc = target.getAttribute(swapTo);
 -      //only change the img source if autoplay is off and the image src is actually different
 -      if(target.getAttribute('data-autoplay') !== 'true' && target.src !== swapSrc) {
 -        target.src = swapSrc;
 -      }
 -    };
 -  };
 -
 -  delegate(document, 'img#profile_page_avatar', 'mouseover', getProfileAvatarAnimationHandler('data-original'));
 -
 -  delegate(document, 'img#profile_page_avatar', 'mouseout', getProfileAvatarAnimationHandler('data-static'));
 -
 -  delegate(document, '#account_header', 'change', ({ target }) => {
 -    const header = document.querySelector('.card .card__img img');
 -    const [file] = target.files || [];
 -    const url = file ? URL.createObjectURL(file) : header.dataset.originalSrc;
 -
 -    header.src = url;
 -  });
 -
 -  delegate(document, '#account_locked', 'change', ({ target }) => {
 -    const lock = document.querySelector('.card .display-name i');
 -
 -    if (lock) {
 -      if (target.checked) {
 -        delete lock.dataset.hidden;
 -      } else {
 -        lock.dataset.hidden = 'true';
 -      }
 -    }
 -  });
 -
 -  delegate(document, '.input-copy input', 'click', ({ target }) => {
 -    target.focus();
 -    target.select();
 -    target.setSelectionRange(0, target.value.length);
 -  });
 -
 -  delegate(document, '.input-copy button', 'click', ({ target }) => {
 -    const input = target.parentNode.querySelector('.input-copy__wrapper input');
 -
 -    const oldReadOnly = input.readonly;
 -
 -    input.readonly = false;
 -    input.focus();
 -    input.select();
 -    input.setSelectionRange(0, input.value.length);
 -
 -    try {
 -      if (document.execCommand('copy')) {
 -        input.blur();
 -        target.parentNode.classList.add('copied');
 -
 -        setTimeout(() => {
 -          target.parentNode.classList.remove('copied');
 -        }, 700);
 -      }
 -    } catch (err) {
 -      console.error(err);
 -    }
 -
 -    input.readonly = oldReadOnly;
 -  });
 -
    delegate(document, '.sidebar__toggle__icon', 'click', () => {
-     const target = document.querySelector('.sidebar ul');
- 
-     if (target.style.display === 'block') {
-       target.style.display = 'none';
-     } else {
-       target.style.display = 'block';
-     }
+     document.querySelector('.sidebar ul').classList.toggle('visible');
    });
  
    // Empty the honeypot fields in JS in case something like an extension
diff --cc package.json
index 4f876816f,387fc4bb6..77328c4c1
--- a/package.json
+++ b/package.json
@@@ -72,10 -71,9 +72,10 @@@
      "@github/webauthn-json": "^0.5.7",
      "@rails/ujs": "^6.1.4",
      "array-includes": "^3.1.4",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.8",
-     "axios": "^0.25.0",
+     "axios": "^0.26.0",
      "babel-loader": "^8.2.3",
      "babel-plugin-lodash": "^3.3.4",
      "babel-plugin-preval": "^5.1.0",