aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/gem_dependency.rb4
-rw-r--r--railties/lib/rails/version.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 471e03fa5f..d58ae450eb 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -120,7 +120,9 @@ module Rails
def unpack_command
cmd = %w(unpack) << @name
- cmd << "--version" << %("#{@requirement.to_s}") if @requirement
+ # We don't quote this requirement as it's run through GemRunner instead
+ # of shelling out to gem
+ cmd << "--version" << @requirement.to_s if @requirement
cmd
end
end
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index 48d24da52e..a0986a2e05 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -1,7 +1,7 @@
module Rails
module VERSION #:nodoc:
MAJOR = 2
- MINOR = 1
+ MINOR = 2
TINY = 0
STRING = [MAJOR, MINOR, TINY].join('.')