about summary refs log tree commit diff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-06-12 16:39:30 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-06-12 16:39:30 -0500
commite931cf656d1de6d89b5b048d8f1de15be7b52690 (patch)
treeb1c0c66b6a88b56c422ea8be1dbef77e42afae72 /config/routes.rb
parent97d2df77aae687c983c1294ebcd3962e4f9d985c (diff)
parent34f1fd2a621ca869c17009487e2f10063812fbd0 (diff)
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
  Conflicts:
 	app/models/glitch/keyword_mute.rb
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 6dd9975b4..3370f01c3 100644
--- 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'