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

This commit is contained in:
Rob Colbert
2019-09-03 18:38:37 -04:00
17 changed files with 226 additions and 22 deletions

View File

@@ -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