Merge branch 'kb_lts' into kb_development

app/controllers/antennas_controller.rb

@@ -12,28 +12,8 @@ class AntennasController < ApplicationController
     @antennas = current_account.antennas.includes(:antenna_domains).includes(:antenna_tags).includes(:antenna_accounts)
   end
 
-  def new
-    @antenna = current_account.antennas.build
-    @antenna.antenna_domains.build
-    @antenna.antenna_tags.build
-    @antenna.antenna_accounts.build
-  end
-
   def edit; end
 
-  def create
-    @antenna = current_account.antennas.build(thin_resource_params)
-
-    saved = @antenna.save
-    saved = @antenna.update(resource_params) if saved
-
-    if saved
-      redirect_to antennas_path
-    else
-      render action: :new
-    end
-  end
-
   def update
     if @antenna.update(resource_params)
       redirect_to antennas_path

app/javascript/mastodon/features/directory/components/account_card.jsx

@@ -202,7 +202,7 @@ class AccountCard extends ImmutablePureComponent {
         <div className='account-card__actions'>
           <div className='account-card__counters'>
             <div className='account-card__counters__item'>
-              <ShortNumber value={account.get('statuses_count')} />
+              <ShortNumber value={account.get('statuses_count')} isHide={account.getIn(['other_settings', 'hide_statuses_count']) || false} />
               <small>
                 <FormattedMessage id='account.posts' defaultMessage='Posts' />
               </small>

app/javascript/mastodon/features/emoji_reactions/index.jsx

@@ -86,7 +86,7 @@ class EmojiReactions extends ImmutablePureComponent {
           showBackButton
           multiColumn={multiColumn}
           extraButton={(
-            <button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleLoadMore}><Icon id='refresh' /></button>
+            <button type='button' className='column-header__button' title={intl.formatMessage(messages.refresh)} aria-label={intl.formatMessage(messages.refresh)} onClick={this.handleRefresh}><Icon id='refresh' /></button>
           )}
         />
 

app/views/antennas/index.html.haml

@@ -1,9 +1,6 @@
 - content_for :page_title do
   = t('antennas.index.title')
 
-- content_for :heading_actions do
-  = link_to t('antennas.new.title'), new_antenna_path, class: 'button'
-
 - if @antennas.empty?
   .muted-hint.center-text= t 'antennas.index.empty'
 - else

app/views/antennas/new.html.haml

@@ -1,9 +0,0 @@
-- content_for :page_title do
-  = t('antennas.new.title')
-
-= simple_form_for @antenna, url: antennas_path do |f|
-  = render 'shared/error_messages', object: @antenna
-  = render 'antenna_fields', f: f, lists: @lists
-
-  .actions
-    = f.button :button, t('antennas.new.save'), type: :submit