]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Sat, 12 Feb 2022 20:36:33 +0000 (21:36 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Sat, 12 Feb 2022 20:36:33 +0000 (21:36 +0100)
1  2 
Gemfile.lock
app/javascript/mastodon/features/compose/components/compose_form.js
package.json
yarn.lock

diff --cc Gemfile.lock
Simple merge
index 311d006265e0b9121729349599abd30f7251b6ac,d75145a09ecedebc5fb24f2eb44287f392af7a5d..26232247d9873d34fcaadc5334d53b5049e140f1
@@@ -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