Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Refactor Sprockets::Helpers::RailsHelper#performing_caching? #2631

Merged
merged 1 commit into from

2 participants

@dasch

No need for them lines to get so long! Also, move that comment into
the method body where it belongs!

@dasch dasch Refactor Sprockets::Helpers::RailsHelper#performing_caching?
No need for them lines to get so long! Also, move that comment into
the method body where it belongs!
db181bd
@spastorino spastorino merged commit 041f1c7 into rails:master
@chewi chewi referenced this pull request from a commit
@chewi chewi Detect joined tables a little more accurately so that included associ…
…ations are still joined when they should be. This addresses #2631.
d17cbfe
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Aug 22, 2011
  1. @dasch

    Refactor Sprockets::Helpers::RailsHelper#performing_caching?

    dasch authored
    No need for them lines to get so long! Also, move that comment into
    the method body where it belongs!
This page is out of date. Refresh to see the latest.
Showing with 7 additions and 2 deletions.
  1. +7 −2 actionpack/lib/sprockets/helpers/rails_helper.rb
View
9 actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -139,9 +139,14 @@ def rewrite_extension(source, dir, ext)
end
end
- # When included in Sprockets::Context, we need to ask the top-level config as the controller is not available
def performing_caching?
- config.action_controller.present? ? config.action_controller.perform_caching : config.perform_caching
+ # When included in Sprockets::Context, we need to ask the
+ # top-level config as the controller is not available.
+ if config.action_controller.present?
+ config.action_controller.perform_caching
+ else
+ config.perform_caching
+ end
end
end
end
Something went wrong with that request. Please try again.