kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #10560 from jkutner/master

Browse source 
Remove jruby-openssl from default Gemfile
This commit is contained in:
Rafael Mendonça França 2013-05-12 11:20:44 -07:00
commit 64a508f662
3 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Gemfile
View file

@ -60,11 +60,6 @@ platforms :jruby do
gem 'json' gem 'json'
gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2.7' gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2.7'
# This is needed by now to let tests work on JRuby
# TODO: When the JRuby guys merge jruby-openssl in
# jruby this will be removed
gem 'jruby-openssl'
group :db do group :db do
gem 'activerecord-jdbcmysql-adapter', '>= 1.2.7' gem 'activerecord-jdbcmysql-adapter', '>= 1.2.7'
gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2.7' gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2.7'

2
railties/lib/rails/generators/rails/app/templates/Gemfile
View file

@ -4,8 +4,6 @@ source 'https://rubygems.org'
<%= database_gemfile_entry -%> <%= database_gemfile_entry -%>
<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%>
<%= assets_gemfile_entry %> <%= assets_gemfile_entry %>
<%= javascript_gemfile_entry -%> <%= javascript_gemfile_entry -%>

3
railties/test/generators/app_generator_test.rb
View file

@ -183,9 +183,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
run_generator([destination_root, "-d", "jdbcmysql"]) run_generator([destination_root, "-d", "jdbcmysql"])
assert_file "config/database.yml", /mysql/ assert_file "config/database.yml", /mysql/
assert_gem "activerecord-jdbcmysql-adapter" assert_gem "activerecord-jdbcmysql-adapter"
# TODO: When the JRuby guys merge jruby-openssl in
# jruby this will be removed
assert_gem "jruby-openssl" if defined?(JRUBY_VERSION)
end end
def test_config_jdbcsqlite3_database def test_config_jdbcsqlite3_database