aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2018-01-11 14:31:37 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2018-01-11 14:31:37 -0500
commit181836d894b0a198b150583fe4ac97dc70badcea (patch)
tree7706aad8e8d23f91ca9d525eb797baa77226ccba /railties/test
parent5e8c79a6fafb8d7a84c272b3c9a0474a0d01b471 (diff)
parent13eff51b1b6a8ea1a21b3fedf0dfa16968b3bebb (diff)
downloadrails-181836d894b0a198b150583fe4ac97dc70badcea.tar.gz
rails-181836d894b0a198b150583fe4ac97dc70badcea.tar.bz2
rails-181836d894b0a198b150583fe4ac97dc70badcea.zip
Merge pull request #31671 from larskanis/pg-1.0
PostgreSQL: Allow pg-1.0 gem to be used with ActiveRecord
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 3f01da42fb..60b9ff1317 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -413,7 +413,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
if defined?(JRUBY_VERSION)
assert_gem "activerecord-jdbcpostgresql-adapter"
else
- assert_gem "pg", "'~> 0.18'"
+ assert_gem "pg", "'>= 0.18', '< 2.0'"
end
end