diff options
author | Robin Houston <robin@lenny.robin> | 2011-07-13 16:57:36 +0100 |
---|---|---|
committer | Robin Houston <robin@lenny.robin> | 2011-07-13 16:57:36 +0100 |
commit | 2de25616eaa4bacf1cd61c54f939a44f03a10263 (patch) | |
tree | 120cd36125b9b2197ec63ee35af30f5df9c51c4a /app/controllers/request_controller.rb | |
parent | 3d5c9dee092962aa1169243535e93eab3915cd7f (diff) | |
parent | b05ce7cc350318ecf111529e77c40b128f7c0d05 (diff) |
Merge branch 'master' of git@github.com:sebbacon/alaveteli
Diffstat (limited to 'app/controllers/request_controller.rb')
-rw-r--r-- | app/controllers/request_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 44e4880c2..441ddc417 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -14,7 +14,8 @@ class RequestController < ApplicationController @@custom_states_loaded = false begin - if !ENV["RAILS_ENV"] == "test" + if ENV["RAILS_ENV"] != "test" + require 'customstates' include RequestControllerCustomStates @@custom_states_loaded = true end |