Commit f8623135 by Jon Frisby

Merge remote-tracking branch 'james2m/master'

Conflicts: lib/tasks/annotate_models.rake lib/tasks/annotate_routes.rake
parents 33860941 2ee2aa54
...@@ -4,3 +4,4 @@ rdoc/* ...@@ -4,3 +4,4 @@ rdoc/*
coverage/* coverage/*
spec/debug.log spec/debug.log
pkg/* pkg/*
*.gem
require 'rubygems' require 'rubygems'
require 'rake/dsl_definition'
require 'rake' require 'rake'
# want other tests/tasks run by default? Add them to the list # want other tests/tasks run by default? Add them to the list
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
require 'optparse' require 'optparse'
require 'annotate' require 'annotate'
require 'rake/dsl_definition'
require 'rake'
task = :annotate_models task = :annotate_models
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment