diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-12 18:01:58 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-12 18:01:58 +0000 |
| commit | a7b84a5073df36d6044668c716d65b7c01995a0c (patch) | |
| tree | 3794fcc10ca2e50c8eece45bb8ff0e93266fd8a6 | |
| parent | 734f1142f82549524b467f8247ad3bea9257d5c0 (diff) | |
| parent | c0ccb597363448899f30c3fcf9f1aba78174b7cd (diff) | |
Merge branch 'release/0.5' into develop
| -rw-r--r-- | app/controllers/request_controller.rb | 1 | ||||
| -rw-r--r-- | config/httpd.conf | 1 | ||||
| -rw-r--r-- | spec/lib/tmail_extensions_spec.rb | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 99aa3c7ea..fbf862af3 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -607,6 +607,7 @@ class RequestController < ApplicationController else incoming_message = IncomingMessage.find(params[:incoming_message_id]) if !incoming_message.info_request.user_can_view?(authenticated_user) + @info_request = incoming_message.info_request # used by view render :template => 'request/hidden', :status => 410 # gone end end diff --git a/config/httpd.conf b/config/httpd.conf index 14197d8e4..3bbe50fb3 100644 --- a/config/httpd.conf +++ b/config/httpd.conf @@ -38,6 +38,7 @@ RewriteRule /files/(.+) http://files.whatdotheyknow.com/$1 PassengerResolveSymlinksInDocumentRoot on # Recommend setting this to 3 or less on servers with 512MB RAM PassengerMaxPoolSize 6 + RailsEnv production </IfModule> # Gzip font resources diff --git a/spec/lib/tmail_extensions_spec.rb b/spec/lib/tmail_extensions_spec.rb index 6a55c34da..02ef8b82e 100644 --- a/spec/lib/tmail_extensions_spec.rb +++ b/spec/lib/tmail_extensions_spec.rb @@ -5,6 +5,11 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe "when using TMail" do + fixtures :info_requests, :incoming_messages + + before(:each) do + ActionMailer::Base.deliveries.clear + end it "should load an email with funny MIME settings" do # just send it to the holding pen |