Browse files

Merge pull request #390 from arunagw/jruby_openssl

Adding jruby-openssl in Gemfile by default. #jruby
  • Loading branch information...
2 parents 65fd004 + 2f331fd commit 3e9bb5459cfc88e0fa6de7a14b21490308ed9682 @josevalim josevalim committed May 5, 2011
View
1 railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -4,6 +4,7 @@ source 'http://rubygems.org'
<%= database_gemfile_entry -%>
+<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) && JRUBY_VERSION < "1.6" -%>
# Asset template engines
<%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%>
gem 'sass'
View
1 railties/test/generators/app_generator_test.rb
@@ -135,6 +135,7 @@ def test_config_jdbcmysql_database
run_generator([destination_root, "-d", "jdbcmysql"])
assert_file "config/database.yml", /jdbcmysql/
assert_file "Gemfile", /^gem\s+["']activerecord-jdbcmysql-adapter["']$/
+ assert_file "Gemfile", /^gem\s+["']jruby-openssl["']$/ if defined?(JRUBY_VERSION) && JRUBY_VERSION < "1.6"
end
def test_config_jdbcsqlite3_database

0 comments on commit 3e9bb54

Please sign in to comment.