diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-22 03:57:51 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-22 03:57:51 -0700 |
| commit | 1ab556fa89a1cac05df0442d3c30c71739129e91 (patch) | |
| tree | 1a8eb9a1fb98d4de622809903b47c14fda83236f | |
| parent | f924dbe566d411e1ed57292e9ba0537168cf6bcc (diff) | |
| parent | 69bad8f51710df9a8bf708e756622a41bd558703 (diff) | |
| download | rails-1ab556fa89a1cac05df0442d3c30c71739129e91.tar.gz rails-1ab556fa89a1cac05df0442d3c30c71739129e91.tar.bz2 rails-1ab556fa89a1cac05df0442d3c30c71739129e91.zip | |
Merge pull request #1206 from arunagw/jruby_openssl_load
Let's load jruby-openssl now for all. #jruby
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 5e1b4b0098..cf5bf9ca57 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -4,7 +4,7 @@ source 'http://rubygems.org' <%= database_gemfile_entry -%> -<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) && JRUBY_VERSION < "1.6" -%> +<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%> # Asset template engines <%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%> gem 'sass' diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 42fe7a7fea..03353301cb 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -136,7 +136,9 @@ class AppGeneratorTest < Rails::Generators::TestCase 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" + # TODO: When the JRuby guys merge jruby-openssl in + # jruby this will be removed + assert_file "Gemfile", /^gem\s+["']jruby-openssl["']$/ if defined?(JRUBY_VERSION) end def test_config_jdbcsqlite3_database |