Merge branch 'main' into tasty

Ember-ruby · Jan 22, 2024 · 092db7f · 092db7f
2 parents cd8cdf5 + 5b0f546
commit 092db7f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/app/javascript/flavours/glitch/components/status_action_bar.jsx b/app/javascript/flavours/glitch/components/status_action_bar.jsx
@@ -338,11 +338,6 @@ class StatusActionBar extends ImmutablePureComponent {
             : reactButton
         }
         <IconButton className='status__action-bar-button bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
-        {
-          permissions
-            ? <EmojiPickerDropdown className='status__action-bar-button' onPickEmoji={this.handleEmojiPick} button={reactButton} disabled={!canReact} />
-            : reactButton
-        }
 
         {filterButton}
 

diff --git a/spec/controllers/admin/export_domain_blocks_controller_spec.rb b/spec/controllers/admin/export_domain_blocks_controller_spec.rb
@@ -19,10 +19,10 @@
 
   describe 'GET #export' do
     it 'renders instances' do
-      Fabricate(:domain_block, domain: 'bad.domain', severity: 'silence', public_comment: 'bad server', private_comment: '')
+      Fabricate(:domain_block, domain: 'bad.domain', severity: 'silence', public_comment: 'bad server', private_comment: 'noop')
       Fabricate(:domain_block, domain: 'worse.domain', severity: 'suspend', reject_media: true, reject_reports: true, public_comment: 'worse server', private_comment: 'worse server :(', obfuscate: true)
-      Fabricate(:domain_block, domain: 'reject.media', severity: 'noop', reject_media: true, public_comment: 'reject media and test unicode characters ♥', private_comment: '')
-      Fabricate(:domain_block, domain: 'no.op', severity: 'noop', public_comment: 'noop', private_comment: '')
+      Fabricate(:domain_block, domain: 'reject.media', severity: 'noop', reject_media: true, public_comment: 'reject media and test unicode characters ♥', private_comment: 'noop')
+      Fabricate(:domain_block, domain: 'no.op', severity: 'noop', public_comment: 'noop', private_comment: 'noop')
 
       get :export, params: { format: :csv }
       expect(response).to have_http_status(200)

diff --git a/spec/fixtures/files/domain_blocks.csv b/spec/fixtures/files/domain_blocks.csv
@@ -1,4 +1,4 @@
 #domain,#severity,#reject_media,#reject_reports,#public_comment,#private_comment,#obfuscate
-bad.domain,silence,false,false,bad server,false
+bad.domain,silence,false,false,bad server,noop,false
 worse.domain,suspend,true,true,worse server,worse server :(,true
-reject.media,noop,true,false,reject media and test unicode characters ♥,false
+reject.media,noop,true,false,reject media and test unicode characters ♥,noop,false