Skip to content
This repository
Browse code

Merge pull request #2615 from cesario/cherry_picks_on_rc6

Cherry picked "remove extra space since comment_if already returns the space." on rc6, already apply on master.
  • Loading branch information...
commit cc363855d234110cbcfc0a2b299e9b52e55ae272 1 parent 088f6f0
Santiago Pastorino spastorino authored
4 railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -8,8 +8,8 @@
8 8 require "action_controller/railtie"
9 9 require "action_mailer/railtie"
10 10 require "active_resource/railtie"
11   -<%= comment_if :skip_sprockets %> require "sprockets/railtie"
12   -<%= comment_if :skip_test_unit %> require "rails/test_unit/railtie"
  11 +<%= comment_if :skip_sprockets %>require "sprockets/railtie"
  12 +<%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
13 13 <% end -%>
14 14
15 15 if defined?(Bundler)
4 railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
@@ -8,8 +8,8 @@
8 8 require "action_controller/railtie"
9 9 require "action_mailer/railtie"
10 10 require "active_resource/railtie"
11   -<%= comment_if :skip_sprockets %> require "sprockets/railtie"
12   -<%= comment_if :skip_test_unit %> require "rails/test_unit/railtie"
  11 +<%= comment_if :skip_sprockets %>require "sprockets/railtie"
  12 +<%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
13 13 <% end -%>
14 14
15 15 Bundler.require

0 comments on commit cc36385

Please sign in to comment.
Something went wrong with that request. Please try again.