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/app/controllers/api/v1/trends_controller.rb
+++ b/app/controllers/api/v1/trends_controller.rb
@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class Api::V1::TrendsController < Api::BaseController
-  before_action :set_tags
-
-  respond_to :json
-
-  def index
-    render json: @tags, each_serializer: REST::TagSerializer
-  end
-
-  private
-
-  def set_tags
-    @tags = TrendingTags.get(limit_param(10))
-  end
-end