Merge remote-tracking branch 'james2m/master'

Conflicts: lib/tasks/annotate_models.rake lib/tasks/annotate_routes.rake
ctran · Mar 1, 2012 · f862313 · f862313
2 parents 3386094 + 2ee2aa5
commit f862313
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ rdoc/*
 coverage/*
 spec/debug.log
 pkg/*
+*.gem
diff --git a/Rakefile b/Rakefile
@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'rake/dsl_definition'
 require 'rake'
 
 # want other tests/tasks run by default? Add them to the list

diff --git a/bin/annotate b/bin/annotate
@@ -2,6 +2,8 @@
 
 require 'optparse'
 require 'annotate'
+require 'rake/dsl_definition'
+require 'rake'
 
 task = :annotate_models