Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
@spastorino spastorino authored
View
4 railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -8,8 +8,8 @@
require "action_controller/railtie"
require "action_mailer/railtie"
require "active_resource/railtie"
-<%= comment_if :skip_sprockets %> require "sprockets/railtie"
-<%= comment_if :skip_test_unit %> require "rails/test_unit/railtie"
+<%= comment_if :skip_sprockets %>require "sprockets/railtie"
+<%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
<% end -%>
if defined?(Bundler)
View
4 railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
@@ -8,8 +8,8 @@
require "action_controller/railtie"
require "action_mailer/railtie"
require "active_resource/railtie"
-<%= comment_if :skip_sprockets %> require "sprockets/railtie"
-<%= comment_if :skip_test_unit %> require "rails/test_unit/railtie"
+<%= comment_if :skip_sprockets %>require "sprockets/railtie"
+<%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
<% end -%>
Bundler.require
Please sign in to comment.
Something went wrong with that request. Please try again.