aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-04-23 06:03:18 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-04-23 06:03:18 -0700
commitdd01c11f9874bebfb9caf90c9da0e3626bb5b78b (patch)
tree4c9979b1d58031cb0ab7d996706c340482f70bd6 /railties
parent979e9d0a103655248ec913e216883b65ec18c7d2 (diff)
parent07b1fe5b3f27427b9b1f6e7971afd170d089aa1d (diff)
downloadrails-dd01c11f9874bebfb9caf90c9da0e3626bb5b78b.tar.gz
rails-dd01c11f9874bebfb9caf90c9da0e3626bb5b78b.tar.bz2
rails-dd01c11f9874bebfb9caf90c9da0e3626bb5b78b.zip
Merge pull request #5919 from joevandyk/rake-dsl-fix
Only include Rake::DSL if it's defined (Rake >= 0.9)
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/tasks/documentation.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 1c28b2c8e6..1760f526e3 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -8,7 +8,7 @@ end
# Monkey-patch to remove redoc'ing and clobber descriptions to cut down on rake -T noise
class RDocTaskWithoutDescriptions < RDoc::Task
- include ::Rake::DSL
+ include ::Rake::DSL if defined?(::Rake::DSL)
def define
task rdoc_task_name