diff options
| author | rick <rick@spacemonkey.local> | 2008-04-23 12:14:59 -0700 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-04-23 12:14:59 -0700 |
| commit | eacb5cf0cab6447db78085c8bda6c94dd329ce6b (patch) | |
| tree | df4bc7789c4d1fe83085b725be0d1fe4a6223880 /railties/lib/rails | |
| parent | 69d29e80f76079262f2e98e350592be1cfdfcd1e (diff) | |
| parent | 6c1c16bfd9eb865dffa68c12c7df66d5a59a8714 (diff) | |
| download | rails-eacb5cf0cab6447db78085c8bda6c94dd329ce6b.tar.gz rails-eacb5cf0cab6447db78085c8bda6c94dd329ce6b.tar.bz2 rails-eacb5cf0cab6447db78085c8bda6c94dd329ce6b.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/gem_dependency.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb index 3985443ceb..2034841cd2 100644 --- a/railties/lib/rails/gem_dependency.rb +++ b/railties/lib/rails/gem_dependency.rb @@ -13,11 +13,9 @@ module Rails @requirement = options[:requirement] elsif options[:version] @requirement = Gem::Requirement.create(options[:version]) - else - raise ArgumentError.new('Must pass either :version or :requirement') end - @version = @requirement.instance_variable_get("@requirements").first.last if @requirement + @version = @requirement.instance_variable_get("@requirements").first.last if @requirement @name = name.to_s @lib = options[:lib] @source = options[:source] |