random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/removing_ruby_junk

Browse Source
This commit is contained in:
mgabdev
2020-12-09 00:00:35 -05:00
parent bb7348fc61 c18991f174
commit 586935f07f
28 changed files with 827 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/locales/en.yml
View File

@@ -325,6 +325,16 @@ en:
title: Undo domain block for %{domain}
undo: Undo
undo: Undo domain block
link_blocks:
add_new: Add new
created_msg: Successfully added link to blacklist
delete: Delete
destroyed_msg: Successfully deleted link from blacklist
link: Link
new:
create: Add link
title: New link blacklist entry
title: Link blacklist
email_domain_blocks:
add_new: Add new
created_msg: Successfully added e-mail domain to blacklist

10
config/locales/en_GB.yml
View File

@@ -292,6 +292,16 @@ en_GB:
title: Undo domain block for %{domain}
undo: Undo
undo: Undo domain block
link_blocks:
add_new: Add new
created_msg: Successfully added link to blacklist
delete: Delete
destroyed_msg: Successfully deleted link from blacklist
link: Link
new:
create: Add link
title: New link blacklist entry
title: Link blacklist
email_domain_blocks:
add_new: Add new
created_msg: Successfully added e-mail domain to blacklist

1
config/navigation.rb
View File

@@ -31,6 +31,7 @@ SimpleNavigation::Configuration.run do |navigation|
s.item :action_logs, safe_join([fa_icon('bars fw'), t('admin.action_logs.title')]), admin_action_logs_url
s.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_url, highlights_on: %r{/admin/reports}
s.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_url, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.admin? }
s.item :link_blocks, safe_join([fa_icon('link fw'), t('admin.link_blocks.title')]), admin_link_blocks_url, highlights_on: %r{/admin/link_blocks}, if: -> { current_user.admin? }
end
n.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), admin_dashboard_url, if: proc { current_user.staff? } do |s|

1
config/routes.rb
View File

@@ -100,6 +100,7 @@ Rails.application.routes.draw do
get '/dashboard', to: 'dashboard#index'
resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
resources :link_blocks, only: [:index, :new, :create, :destroy]
resources :action_logs, only: [:index]
resources :warning_presets, except: [:new]
resource :settings, only: [:edit, :update]