aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-01-23 23:08:22 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-01-23 23:08:28 -0200
commitfb3996f89d4ef8ab087e28b9b2ab691ba628a33c (patch)
treec5e18e828bec0081f9d31776fe969cd29a45bce8
parentc5989cc4837b5f814e14332a0b90a44dfa806b4e (diff)
downloadrails-fb3996f89d4ef8ab087e28b9b2ab691ba628a33c.tar.gz
rails-fb3996f89d4ef8ab087e28b9b2ab691ba628a33c.tar.bz2
rails-fb3996f89d4ef8ab087e28b9b2ab691ba628a33c.zip
Depend on thor >= 0.17.0
-rw-r--r--Gemfile3
-rw-r--r--railties/railties.gemspec2
2 files changed, 1 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 122c108a07..09d0f502ce 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,9 +12,6 @@ gem 'jquery-rails', '~> 2.2.0', github: 'rails/jquery-rails'
gem 'turbolinks'
gem 'coffee-rails', github: 'rails/coffee-rails'
-# TODO: Release thor
-gem 'thor', github: 'wycats/thor', branch: 'master'
-
gem 'activerecord-deprecated_finders', github: 'rails/activerecord-deprecated_finders', branch: 'master'
# Needed for compiling the ActionDispatch::Journey parser
diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index e39430560f..a55bf012da 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.gemspec
@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
s.add_dependency 'actionpack', version
s.add_dependency 'rake', '>= 0.8.7'
- s.add_dependency 'thor', '>= 0.15.4', '< 2.0'
+ s.add_dependency 'thor', '>= 0.17.0', '< 2.0'
s.add_dependency 'rdoc', '~> 3.4'
end