Merge branch 'master' into moderation

[rails.git] / Rakefile

diff --git a/Rakefile b/Rakefile
index 039e38f47aa6773d588e355ca59d27ce013605d7..9a5ea7383aa83eec12490380a7391d1bb93eeb96 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,6 @@
 # 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.expand_path('../config/application', __FILE__)
-require 'rake'
+require_relative "config/application"
 
-OpenStreetMap::Application.load_tasks
+Rails.application.load_tasks