Mercurial > hg > soundsoftware-site
diff app/controllers/welcome_controller.rb @ 1015:52be96e83080 cannam
Merge from branch "live"
author | Chris Cannam |
---|---|
date | Mon, 12 Nov 2012 15:17:17 +0000 |
parents | 3e52bc15dd67 |
children | bb32da3bea34 |
line wrap: on
line diff
--- a/app/controllers/welcome_controller.rb Fri Nov 09 14:41:57 2012 +0000 +++ b/app/controllers/welcome_controller.rb Mon Nov 12 15:17:17 2012 +0000 @@ -25,7 +25,6 @@ @site_project = Project.find_by_identifier "soundsoftware-site" @site_news = [] @site_news = News.latest_for @site_project if @site_project - @projects = Project.latest User.current # tests if user is logged in to generate the tips of the day list if User.current.logged?