mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-20 09:10:12 +01:00
fix merge errors and some tests
This commit is contained in:
parent
0f525436ff
commit
f2d977e12a
7 changed files with 17 additions and 34 deletions
|
|
@ -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 } }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue