Merge pull request #5421 from tomhughes/ecma-version

[rails.git] / app / controllers / traces_controller.rb

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index d723bac5b73b634f62d32e99ae6337f8e41c3916..14648dc9c37eea68d78bb9b255ede055cbca15c1 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -2,7 +2,7 @@ class TracesController < ApplicationController
   include UserMethods
   include PaginationMethods
 
   include UserMethods
   include PaginationMethods
 

-  layout "site", :except => :georss
+  layout "site"

 
   before_action :authorize_web
   before_action :set_locale
 
   before_action :authorize_web
   before_action :set_locale


@@ -192,17 +192,6 @@ class TracesController < ApplicationController
     head :not_found
   end
 
     head :not_found
   end
 

-  def georss
-    @traces = Trace.visible_to_all.visible
-
-    @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] }) if params[:display_name]
-
-    @traces = @traces.tagged(params[:tag]) if params[:tag]
-    @traces = @traces.order("timestamp DESC")
-    @traces = @traces.limit(20)
-    @traces = @traces.includes(:user)
-  end
-

   private
 
   def do_create(file, tags, description, visibility)
   private
 
   def do_create(file, tags, description, visibility)