fix merge errors and some tests

app/controllers/login_controller.rb

@@ -86,17 +86,8 @@ class LoginController < ApplicationController
         return unless should_expire_sessions?
         # Get expiry time (allow ten seconds window for the case where we have none)
         expiry_time = session['expiry_time'] || Time.now + 10
-<<<<<<< HEAD
-        @time_left = expiry_time - Time.now
-        if @time_left < (10*60) # Session will time out before the next check
-          @msg = 'login.session_time_out'
-        else
-          @msg = ""
-        end
-=======
         time_left = expiry_time - Time.now
         @session_expired = ( time_left < (10*60) ) # Session will time out before the next check
->>>>>>> replace old prototype/jrails code for periodic checks and start work on autocomplete and edit projects
       end
     end
     respond_to do |format|

app/controllers/projects_controller.rb

@@ -258,14 +258,15 @@ class ProjectsController < ApplicationController
 
   def render_rss_feed
     lambda do
-      render_rss_feed_for @projects, :feed => feed_options,
-        :item => { :title => :name, :description => lambda { |p| summary(p) } }
+      render_rss_feed_for current_user.projects, :feed => feed_options,
+        :title => :name,
+        :item => { :description => lambda { |p| summary(p) } }
     end
   end
 
   def render_atom_feed
     lambda do
-      render_atom_feed_for @projects, :feed => feed_options,
+      render_atom_feed_for current_user.projects, :feed => feed_options,
         :item => { :description => lambda { |p| summary(p) },
         :title => :name,
         :author => lambda { |p| nil } }

app/views/contexts/create.js.erb

@@ -8,12 +8,6 @@
   TracksForm.show_errors(html_for_error_messages());
 <% end -%>
 
-/*
-if @saved
-  container_name = 'list-contexts-' + (@context.hidden? ? 'hidden' : 'active')
-  page.insert_html :bottom, container_name, :partial => 'context_listing', :locals => { :context_listing => @context }
-*/
-
 function hide_empty_message() {
   $('contexts-empty-nd').hide();
 }