diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-24 11:24:55 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-24 11:24:55 +0000 |
| commit | 63586e47e1b53bca023fdbba83bff2cd138feaf3 (patch) | |
| tree | 5c9ed659c968f092317de6bab59a712e2584ca66 /app/controllers/api_controller.rb | |
| parent | 80e66c0fba234fc78f13d5e7635f65d2bc25fe58 (diff) | |
| parent | b0a939a4d44077b4602176042ff4432b790561ad (diff) | |
Merge branch 'release/0.16' into wdtk
Diffstat (limited to 'app/controllers/api_controller.rb')
| -rw-r--r-- | app/controllers/api_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index e7bea67ef..00a3beebd 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -200,7 +200,7 @@ class ApiController < ApplicationController ]) end if feed_type == "atom" - render :template => "api/request_events.atom", :layout => false + render :template => "api/request_events", :formats => ['atom'], :layout => false elsif feed_type == "json" # For the JSON feed, we take a "since" parameter that allows the client # to restrict to events more recent than a certain other event |