diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-11-29 15:06:07 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-11-29 15:06:07 +0000 |
| commit | eb1432f9992275df485f8502ad3ab6f7c8d494b7 (patch) | |
| tree | ec20310d47c7f4e4cd136ac1671b32db4a379ea7 /app/controllers/request_controller.rb | |
| parent | 5ddd0620f8023c4bbf7d82e61f841dadd73bb7ba (diff) | |
| parent | 20089cf7b5045d504b7240bc92e2b6068fcc2246 (diff) | |
Merge remote-tracking branch 'origin/merged-rails-3-2-assset-pipeline' into rails-3-develop
Conflicts:
Gemfile.lock
Diffstat (limited to 'app/controllers/request_controller.rb')
| -rw-r--r-- | app/controllers/request_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 841950cd5..d982bd391 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -958,8 +958,9 @@ class RequestController < ApplicationController end if !done file_info = { :filename => 'correspondence.txt', - :data => render_to_string(:template => 'request/show.text', - :layout => false) } + :data => render_to_string(:template => 'request/show', + :layout => false, + :formats => [:text]) } end file_info end |