Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/removing_ruby_junk
This commit is contained in:
commit
2bbb5be505
|
@ -170,6 +170,7 @@ class DefaultNavigationBar extends ImmutablePureComponent {
|
||||||
<NavigationBarButton title='Explore' icon='explore' to='/explore' />
|
<NavigationBarButton title='Explore' icon='explore' to='/explore' />
|
||||||
<NavigationBarButton title='News' icon='news' to='/news' />
|
<NavigationBarButton title='News' icon='news' to='/news' />
|
||||||
<NavigationBarButton title='Groups' icon='group' to='/groups' />
|
<NavigationBarButton title='Groups' icon='group' to='/groups' />
|
||||||
|
<NavigationBarButton title='TV' icon='tv' href='https://tv.gab.com' />
|
||||||
|
|
||||||
<div className={[_s.d, _s.h20PX, _s.w1PX, _s.mr10, _s.ml10, _s.bgNavigationBlend].join(' ')} />
|
<div className={[_s.d, _s.h20PX, _s.w1PX, _s.mr10, _s.ml10, _s.bgNavigationBlend].join(' ')} />
|
||||||
|
|
||||||
|
@ -241,6 +242,7 @@ class DefaultNavigationBar extends ImmutablePureComponent {
|
||||||
icon={action.icon}
|
icon={action.icon}
|
||||||
count={action.count}
|
count={action.count}
|
||||||
to={action.to || undefined}
|
to={action.to || undefined}
|
||||||
|
href={action.href || undefined}
|
||||||
onClick={action.onClick ? () => action.onClick() : undefined}
|
onClick={action.onClick ? () => action.onClick() : undefined}
|
||||||
key={`action-btn-${i}`}
|
key={`action-btn-${i}`}
|
||||||
isXS
|
isXS
|
||||||
|
|
|
@ -81,6 +81,10 @@ class HomePage extends React.PureComponent {
|
||||||
page='home'
|
page='home'
|
||||||
title={title}
|
title={title}
|
||||||
actions={[
|
actions={[
|
||||||
|
{
|
||||||
|
icon: 'tv',
|
||||||
|
href: 'https://tv.gab.com',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
icon: 'chat',
|
icon: 'chat',
|
||||||
to: '/messages',
|
to: '/messages',
|
||||||
|
|
|
@ -2,6 +2,8 @@ class AddIndexToStatusesReply < ActiveRecord::Migration[5.2]
|
||||||
disable_ddl_transaction!
|
disable_ddl_transaction!
|
||||||
|
|
||||||
def change
|
def change
|
||||||
add_index :statuses, :reply, algorithm: :concurrently
|
if !index_exists?(:statuses, :reply)
|
||||||
|
add_index :statuses, :reply, algorithm: :concurrently
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -44,7 +44,7 @@ module GabSocial
|
||||||
def deleteallremote
|
def deleteallremote
|
||||||
dry_run = options[:dry_run] ? ' (DRY RUN)' : ''
|
dry_run = options[:dry_run] ? ' (DRY RUN)' : ''
|
||||||
|
|
||||||
Account.remote.by_domain_accounts.find_in_batches do |acct|
|
Account.remote.by_domain_accounts.each do |acct|
|
||||||
domain = acct.domain
|
domain = acct.domain
|
||||||
|
|
||||||
say("\n\n\n - Starting domain block for #{domain} #{dry_run}", :green)
|
say("\n\n\n - Starting domain block for #{domain} #{dry_run}", :green)
|
||||||
|
|
Loading…
Reference in New Issue