Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-10 09:24:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	app/views/projects/_project_settings.html.erb
	app/views/todos/_todo.html.erb
This commit is contained in:
Reinier Balt 2013-09-13 16:52:06 +02:00
commit 9c86396ef0
36 changed files with 94 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/contexts_controller.rb
View file

@ -18,11 +18,7 @@ class ContextsController < ApplicationController
format.html &render_contexts_html
format.m &render_contexts_mobile
format.xml { render :xml => @all_contexts.to_xml( :except => :user_id ) }
format.rss do
@feed_title = 'Tracks Contexts'
@feed_description = "Lists all the contexts for #{current_user.display_name}"
end
format.atom do
format.any(:rss, :atom) do
@feed_title = 'Tracks Contexts'
@feed_description = "Lists all the contexts for #{current_user.display_name}"
end