aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-06-18 15:30:53 +0200
committerJosé Valim <jose.valim@gmail.com>2012-06-18 15:59:22 +0200
commit8c02918497dca0415de0d7a605b9015b67c623ab (patch)
treef5aaea0bcfd92633f71df2912f2924eb563c2115
parent961cbcb78f527f2bafac2e06f6f85af9eadb977b (diff)
downloadrails-8c02918497dca0415de0d7a605b9015b67c623ab.tar.gz
rails-8c02918497dca0415de0d7a605b9015b67c623ab.tar.bz2
rails-8c02918497dca0415de0d7a605b9015b67c623ab.zip
Require thor 0.15.3 onwards
-rw-r--r--railties/lib/rails/generators/base.rb1
-rw-r--r--railties/railties.gemspec6
2 files changed, 2 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 28d7680669..a49a1724c5 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -20,6 +20,7 @@ module Rails
include Rails::Generators::Actions
add_runtime_options!
+ strict_args_position!
# Returns the source root for this generator using default_source_root as default.
def self.source_root(path=nil)
diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index 2a39826c8d..207739c4bc 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.gemspec
@@ -22,11 +22,7 @@ Gem::Specification.new do |s|
s.rdoc_options << '--exclude' << '.'
s.add_dependency('rake', '>= 0.8.7')
-
- # The current API of the Thor gem (0.14) will remain stable at least until Thor 2.0. Because
- # Thor is so heavily used by other gems, we will accept Thor's semver guarantee to reduce
- # the possibility of conflicts.
- s.add_dependency('thor', '>= 0.14.6', '< 2.0')
+ s.add_dependency('thor', '>= 0.15.3', '< 2.0')
s.add_dependency('rdoc', '~> 3.4')
s.add_dependency('activesupport', version)
s.add_dependency('actionpack', version)