Merge pull request #1707 from chancancode/as_json_fix

The Rails JSON encoder API requires `as_json` to take an optional arg

app/models/admin_dashboard_data.rb

@@ -61,7 +61,7 @@ class AdminDashboardData
     AdminDashboardData.new.problems
   end
 
-  def as_json
+  def as_json(options = nil)
     @json ||= {
       reports: REPORTS.map { |type| Report.find(type).as_json },
       admins: User.admins.count,

app/models/incoming_links_report.rb

@@ -8,7 +8,7 @@ class IncomingLinksReport
     @data = nil
   end
 
-  def as_json
+  def as_json(options = nil)
     {
       type: self.type,
       title: I18n.t("reports.#{self.type}.title"),

app/models/report.rb

@@ -11,7 +11,7 @@ class Report
     @prev30Days = nil
   end
 
-  def as_json
+  def as_json(options = nil)
     {
      type: self.type,
      title: I18n.t("reports.#{self.type}.title"),

lib/search/grouped_search_results.rb

@@ -15,7 +15,7 @@ class Search
       return topic_results.result_ids
     end
 
-    def as_json
+    def as_json(options = nil)
       @by_type.values.map do |grouped_result|
         grouped_result.as_json
       end

lib/search/search_result.rb

@@ -15,7 +15,7 @@ class Search
       @url, @id, @title = row[:url], row[:id], row[:title]
     end
 
-    def as_json
+    def as_json(options = nil)
       json = {id: @id, title: @title, url: @url}
       json[:avatar_template] = @avatar_template if @avatar_template.present?
       json[:color] = @color if @color.present?

lib/search/search_result_type.rb

@@ -20,7 +20,7 @@ class Search
       @result_ids << result.id
     end
 
-    def as_json
+    def as_json(options = nil)
       { type: @type.to_s,
         name: I18n.t("search.types.#{@type.to_s}"),
         more: @more,