summaryrefslogtreecommitdiff
path: root/app/controllers/events_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/events_controller.rb')
-rw-r--r--app/controllers/events_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index c151f6b..02f97aa 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -18,8 +18,8 @@
class EventsController < ApplicationController
- before_filter :authentication
- before_filter :add_cookie_header # only for anonymous participants
+ before_action :authentication
+ before_action :add_cookie_header # only for anonymous participants
def initialize
super
@@ -70,7 +70,7 @@ private
respond_to do |format|
format.json { render :json => JSON.pretty_generate(events) }
format.xml { render :xml => events }
- format.text { render :text => events_render_txt(events) }
+ format.text { render :plain => events_render_txt(events) }
end
end