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

diff --cc Gemfile.lock
Simple merge

diff --cc app/javascript/mastodon/features/compose/components/compose_form.js
index 311d006265e0b9121729349599abd30f7251b6ac,d75145a09ecedebc5fb24f2eb44287f392af7a5d..26232247d9873d34fcaadc5334d53b5049e140f1
--- 1/app/javascript/mastodon/features/compose/components/compose_form.js
--- 2/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@@ -260,10 -259,10 +260,10 @@@ class ComposeForm extends ImmutablePure
            <div className='compose-form__buttons'>
              <UploadButtonContainer />
              <PollButtonContainer />
-             <PrivacyDropdownContainer />
+             <PrivacyDropdownContainer disabled={this.props.isEditing} />
              <SpoilerButtonContainer />
            </div>
 -          <div className='character-counter__wrapper'><CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} /></div>
 +          <div className='character-counter__wrapper'><CharacterCounter max={maxChars} text={this.getFulltextForCharacterCounting()} /></div>
          </div>
  
          <div className='compose-form__publish'>

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge