Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Cherry picked "remove extra space since comment_if already returns the space." on rc6, already apply on master. #2615

Merged
merged 1 commit into from

3 participants

@franckverrot

(cherry picked from commit 5e73a2f)

@spastorino spastorino merged commit fe7282e into rails:3-1-stable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Aug 21, 2011
  1. @siong1987 @franckverrot

    remove extra space since comment_if already returns the space.

    siong1987 authored franckverrot committed
    (cherry picked from commit 5e73a2f)
This page is out of date. Refresh to see the latest.
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
Something went wrong with that request. Please try again.