diff options
| -rw-r--r-- | railties/lib/rails/generators/base.rb | 1 | ||||
| -rw-r--r-- | railties/railties.gemspec | 6 |
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) |