Skip to content

Commit

Permalink
Remove inclusion of rubysl gem for rbx on generated Gemfile
Browse files Browse the repository at this point in the history
From #14026:

    Specific rbx-2 to limit testing on Rubinius 2.x (since there will be
    other versions of Rubinius > 2.x soon).

    Also, as of Rubinius 2.2.5, it is no longer necessary to bundle the
    rubysl gem.

This is what Rails master/4.1 supports, so we don't need to add rubysl to
gemfiles anymore.

Conflicts:
	railties/test/generators/app_generator_test.rb
  • Loading branch information
carlosantoniodasilva committed Feb 26, 2014
1 parent 759c99b commit b6c713f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
9 changes: 0 additions & 9 deletions railties/lib/rails/generators/app_base.rb
Expand Up @@ -111,7 +111,6 @@ def gemfile_entries
javascript_gemfile_entry,
jbuilder_gemfile_entry,
sdoc_gemfile_entry,
platform_dependent_gemfile_entry,
spring_gemfile_entry,
@extra_entries].flatten.find_all(&@gem_filter)
end
Expand Down Expand Up @@ -262,14 +261,6 @@ def assets_gemfile_entry
gems
end

def platform_dependent_gemfile_entry
gems = []
if RUBY_ENGINE == 'rbx'
gems << GemfileEntry.version('rubysl', nil)
end
gems
end

def jbuilder_gemfile_entry
comment = 'Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder'
GemfileEntry.version('jbuilder', '~> 2.0', comment)
Expand Down
7 changes: 0 additions & 7 deletions railties/test/generators/app_generator_test.rb
Expand Up @@ -265,13 +265,6 @@ def test_inclusion_of_javascript_runtime
end
end

def test_inclusion_of_plateform_dependent_gems
run_generator([destination_root])
if RUBY_ENGINE == 'rbx'
assert_gem 'rubysl'
end
end

def test_jquery_is_the_default_javascript_library
run_generator
assert_file "app/assets/javascripts/application.js" do |contents|
Expand Down

0 comments on commit b6c713f

Please sign in to comment.