Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline

2017-10-25 16:01:20 -05:00
parent 5f0268ab84 a76b024228
commit 42f2045c21
21 changed files with 341 additions and 11 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -193,6 +193,7 @@ Rails.application.routes.draw do
      end

      namespace :timelines do
+        resource :direct, only: :show, controller: :direct
        resource :home, only: :show, controller: :home
        resource :public, only: :show, controller: :public
        resources :tag, only: :show