about summary refs log tree commit diff
path: root/app/javascript/mastodon/reducers/index.js
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-06-04 02:18:18 +0200
committerGitHub <noreply@github.com>2018-06-04 02:18:18 +0200
commit0deb9fa6b9b8820fcb0a9ebd221178a8ec82490a (patch)
tree8d41e4f356c41e74ea2b1d5c0b0552b058d7495a /app/javascript/mastodon/reducers/index.js
parent00512ecf87e1098f5632eeec2cd116344a787523 (diff)
Remove trending hashtags (#7711)
* Delete trends_controller.rb

* Update routes.rb

* Update trending_tags.rb

* Update index.js

* Update index.js

* Update search_results.js

* Update async-components.js

* Update index.js

* Delete trends.js

* Delete trends.js

* Delete trends_container.js

* Delete trends.js

* Update search_results.js

* Update search_results_container.js
Diffstat (limited to 'app/javascript/mastodon/reducers/index.js')
-rw-r--r--app/javascript/mastodon/reducers/index.js2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index 019c1f466..3d9a6a132 100644
--- a/app/javascript/mastodon/reducers/index.js
+++ b/app/javascript/mastodon/reducers/index.js
@@ -26,7 +26,6 @@ import height_cache from './height_cache';
 import custom_emojis from './custom_emojis';
 import lists from './lists';
 import listEditor from './list_editor';
-import trends from './trends';
 
 const reducers = {
   dropdown_menu,
@@ -56,7 +55,6 @@ const reducers = {
   custom_emojis,
   lists,
   listEditor,
-  trends,
 };
 
 export default combineReducers(reducers);