diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-03-06 17:11:47 -0800 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-03-06 17:11:47 -0800 |
commit | fc770ee6eb342d4562b6588612f1c9aca46f58e1 (patch) | |
tree | 8833be60c0f0cb39d33dbaf4538ceca8d848e57f /app/controllers/api_controller.rb | |
parent | 455a1f07f3099d1d94fff2a7efcf99fb8fd6841d (diff) | |
parent | 7abb45b0549af892b7f1ec2beeca5a42f8c2ef7a (diff) |
Merge remote-tracking branch 'openaustralia_github/make-links-relative' into develop
Conflicts:
app/controllers/admin_request_controller.rb
app/models/request_mailer.rb
app/views/admin_general/index.rhtml
app/views/admin_general/stats.rhtml
app/views/admin_public_body/_one_list.rhtml
app/views/admin_public_body/_tags.rhtml
app/views/admin_public_body/show.rhtml
app/views/admin_request/show.rhtml
app/views/admin_user/show.rhtml
app/views/layouts/admin.rhtml
app/views/public_body/show.rhtml
app/views/request/new.rhtml
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) |