diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:52:55 -0700 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-03-19 14:52:55 -0700 |
commit | 0adcb32b81002528ea27855e2303118cbe9aefc1 (patch) | |
tree | c0f3efbf627045d9443e6ff3fadcb40e8e85dbdc /app/controllers/api_controller.rb | |
parent | 844351acd314467dae44af0e10847dfd597fcc03 (diff) | |
parent | f83b917ec2c59da0ce7c27da19b740366da58419 (diff) |
Merge branch 'release/0.8'
Diffstat (limited to 'app/controllers/api_controller.rb')
-rw-r--r-- | app/controllers/api_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 15fb4f5f9..5d8ceb888 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -220,7 +220,7 @@ class ApiController < ApplicationController :event_id => event.id, :created_at => event.created_at.iso8601, :event_type => event.event_type, - :request_url => main_url(request_url(request)), + :request_url => request_url(request), :request_email => request.incoming_email, :title => request.title, :body => event.outgoing_message.body, @@ -228,7 +228,7 @@ class ApiController < ApplicationController :user_name => request.user_name, } if request.user - this_event[:user_url] = main_url(user_url(request.user)) + this_event[:user_url] = user_url(request.user) end @event_data.push(this_event) |