diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-02-25 21:46:55 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-02-25 21:54:29 -0300 |
| commit | 1d298bd6217d6c0feb3aa698d65289b92b11ab8d (patch) | |
| tree | b023c2df52f3970db8db5743cee3ce0998aecd60 | |
| parent | b1656fa6305a5c8237027ab8165d7292751c0e86 (diff) | |
| download | rails-1d298bd6217d6c0feb3aa698d65289b92b11ab8d.tar.gz rails-1d298bd6217d6c0feb3aa698d65289b92b11ab8d.tar.bz2 rails-1d298bd6217d6c0feb3aa698d65289b92b11ab8d.zip | |
Remove inclusion of rubysl gem for rbx on generated Gemfile
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.
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 9 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 7 |
2 files changed, 0 insertions, 16 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index f1f79d8378..b2ecc22294 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -111,7 +111,6 @@ module Rails javascript_gemfile_entry, jbuilder_gemfile_entry, sdoc_gemfile_entry, - platform_dependent_gemfile_entry, spring_gemfile_entry, @extra_entries].flatten.find_all(&@gem_filter) end @@ -258,14 +257,6 @@ module Rails 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) diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 3bf08b105a..5ebdadacbf 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -265,13 +265,6 @@ class AppGeneratorTest < Rails::Generators::TestCase end end - def test_inclusion_of_platform_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| |