diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-11-25 23:49:17 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-11-25 23:50:35 +0100 |
commit | 443ec4f8ba3d9f78acc1b89e2b29ad364cd5e956 (patch) | |
tree | 6c83fa75cc4f699503546be0a68409fffa11080f /config/routes.rb | |
parent | 8c2fe2a846dd14914f7faa4bf71be21058249a93 (diff) | |
parent | b1fd6d44901a13450d22884b02eb6e9ae4fc1248 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/config/routes.rb b/config/routes.rb index 74869792b..09d625abd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -303,12 +303,27 @@ Rails.application.routes.draw do resources :account_moderation_notes, only: [:create, :destroy] resource :follow_recommendations, only: [:show, :update] + resources :tags, only: [:show, :update] - resources :tags, only: [:index, :show, :update] do - collection do - post :approve_all - post :reject_all - post :batch + namespace :trends do + resources :links, only: [:index] do + collection do + post :batch + end + end + + resources :tags, only: [:index] do + collection do + post :batch + end + end + + namespace :links do + resources :preview_card_providers, only: [:index], path: :publishers do + collection do + post :batch + end + end end end end @@ -402,7 +417,7 @@ Rails.application.routes.draw do resources :favourites, only: [:index] resources :bookmarks, only: [:index] resources :reports, only: [:create] - resources :trends, only: [:index] + resources :trends, only: [:index], controller: 'trends/tags' resources :filters, only: [:index, :create, :show, :update, :destroy] resources :endorsements, only: [:index] resources :markers, only: [:index, :create] @@ -413,6 +428,11 @@ Rails.application.routes.draw do resources :apps, only: [:create] + namespace :trends do + resources :links, only: [:index] + resources :tags, only: [:index] + end + namespace :emails do resources :confirmations, only: [:create] end @@ -516,7 +536,9 @@ Rails.application.routes.draw do end end - resources :trends, only: [:index] + namespace :trends do + resources :tags, only: [:index] + end post :measures, to: 'measures#create' post :dimensions, to: 'dimensions#create' |