Merge branch 'release/0.11'0.11.0.3

1 files changed, 5 insertions, 10 deletions

diff --git a/Rakefile b/Rakefile
index dc500c97c..5fa2a360d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,14 +1,9 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
-
-
+require File.expand_path('../config/application', __FILE__)
 require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
-
-require 'tasks/rails'
-
-
-Dir[File.join(File.dirname(__FILE__),'commonlib','rblib','tests','*.rake')].each { |file| load(file) }
+Alaveteli::Application.load_tasks
+if Rails.env == 'test'
+    Dir[File.join(File.dirname(__FILE__),'commonlib','rblib','tests','*.rake')].each { |file| load(file) }
+end