Merge remote-tracking branch 'origin/master' into gs-master

2018-06-03 19:44:05 -05:00
parent 0f979c3460 0deb9fa6b9
commit c55263027a
13 changed files with 2 additions and 226 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -271,7 +271,6 @@ Rails.application.routes.draw do
      resources :favourites, only: [:index]
      resources :bookmarks,  only: [:index]
      resources :reports,    only: [:index, :create]
-      resources :trends,     only: [:index]

      namespace :apps do
        get :verify_credentials, to: 'credentials#show'