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

config/locales/en.yml

@@ -70,6 +70,8 @@ en:
       moderator: Mod
     unavailable: Profile unavailable
     unfollow: Unfollow
+  promotions:
+      title: Promotions
   admin:
     account_actions:
       action: Perform action

config/navigation.rb

@@ -55,6 +55,7 @@ SimpleNavigation::Configuration.run do |navigation|
       s.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' }, if: -> { current_user.admin? }
       s.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' }, if: -> { current_user.admin? }
       s.item :moderation, safe_join([fa_icon('id-card-o fw'), t('verifications.moderation.title')]), settings_verifications_moderation_url, if: -> { current_user.admin? }
+      s.item :promotions, safe_join([fa_icon('star fw'), t('promotions.title')]), settings_promotions_url, if: -> { current_user.admin? }
     end
 
     n.item :logout, safe_join([fa_icon('sign-out fw'), t('auth.logout')]), destroy_user_session_url, link_html: { 'data-method' => 'delete' }

config/routes.rb

@@ -89,6 +89,8 @@ Rails.application.routes.draw do
       post '/btcpay-notification', to: 'upgrade#btcpay_notification', as: :btcpay_notification
     end
 
+    resources :promotions, only: [:index, :new, :create, :edit, :update, :destroy]
+    
     namespace :verifications do
       get :moderation, to: 'moderation#index', as: :moderation
       get 'moderation/:id/approve', to: 'moderation#approve', as: :approve
@@ -236,7 +238,7 @@ Rails.application.routes.draw do
     resources :users, only: [] do
       resource :two_factor_authentication, only: [:destroy]
     end
-
+    
     resources :custom_emojis, only: [:index, :new, :create, :update, :destroy] do
       member do
         post :copy