diff --git a/Gemfile.lock b/Gemfile.lock index e9f4c73..b2f7b89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/HubFeenixMakers/merged - revision: 926f6ef197308263b3b9d1dd3db6041b89a81a9b + revision: b44c29ff50bbfc07b04a6064804ac3684eed151d specs: merged (0.1.0) active_hash diff --git a/config/routes.rb b/config/routes.rb index ef2a676..d5e869a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,11 +11,6 @@ Rails.application.routes.draw do mount Thredded::Engine => '/forum' - mount Merged::Engine => "/merged" unless Rails.env.production? + merged_routes root: true - post "/form" , to: "merged/form#post" , as: :post_form - get "/news/:id" , to: "merged/view#page" , id: :id , as: :view_blog - get ":id" , to: "merged/view#page" , id: :id , as: :view_page - - root "merged/view#page" , id: 'index' end