aboutsummaryrefslogtreecommitdiffstats
path: root/config.ru
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-06-04 15:03:02 +0100
committerLouise Crow <louise.crow@gmail.com>2013-06-04 15:03:02 +0100
commita885764b65916020d9182073b38f6951a20d4b8c (patch)
tree0988651c144b65a8e46b28b376b2e72a5947d934 /config.ru
parenteb1c465162420ad62c16dccb983cb28aa89a4639 (diff)
parenta919141992a40599f99b32bd4a8312a0009f3f7a (diff)
Merge branch 'release/0.11'0.11.0.3
Diffstat (limited to 'config.ru')
-rw-r--r--config.ru6
1 files changed, 4 insertions, 2 deletions
diff --git a/config.ru b/config.ru
index 30b00bfa1..74748fd45 100644
--- a/config.ru
+++ b/config.ru
@@ -1,2 +1,4 @@
-require File.dirname(__FILE__) + '/config/environment'
-run ActionController::Dispatcher.new
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment', __FILE__)
+run Alaveteli::Application