upgrade to rails3, but grip is broken

app/controllers/application_controller.rb

@@ -1,8 +1,8 @@
 class ApplicationController < ActionController::Base
-
-  helper :all
   protect_from_forgery
-
+  
+  helper :all
+  
   before_filter :set_locale
   
   filter_parameter_logging :password
@@ -42,5 +42,5 @@ class ApplicationController < ActionController::Base
     render :text => 'missing entry_name' if params[:entry_name].blank?
     return
   end
-  
+    
 end

app/controllers/pages_controller.rb

@@ -10,7 +10,7 @@ class PagesController < ApplicationController
   end
   
   def show    
-    @page = Page.find_by_full_name(params[:page_name].join("/"))
+    @page = Page.find_by_full_name(params[:page_name])
     render_liquid_page
   end
   

app/helpers/admin_helper.rb

@@ -2,7 +2,7 @@ module AdminHelper
   
   def show_parent_items_link(parent_item)  
     @parent_items = @parent_item.ancestors.map{ |i| i.name }
-    ( @parent_items.map{ |i| link_to(i, admin_items_path(:parent_name=>i) ) } << parent_item.name ).join("/")
+    ( @parent_items.map{ |i| link_to(i, admin_items_path(:parent_name=>i) ) } << parent_item.name ).join("/").html_safe
   end
   
 end

app/helpers/application_helper.rb

@@ -1,3 +1,2 @@
-# Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
 end

app/views/layouts/admin.html.erb

@@ -39,7 +39,7 @@
 
 <%= javascript_include_tag "jquery",
                            "jquery-ui",
-                           "jrails",
+                           "rails",
                            "easy",
                            "application", :cache => 'all' %>
 <%= yield :page_specific_javascript %>

app/views/layouts/panel.html.erb

@@ -37,7 +37,7 @@
 
 <%= javascript_include_tag "jquery",
                            "jquery-ui",
-                           "jrails",
+                           "rails",
                            "easy",
                            "application", :cache => 'all' %>
 <%= yield :page_specific_javascript %>