Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
Commits on Oct 01, 2011
@arunagw arunagw Warning Use of :: in void context Warning removed 32df5b6
@josevalim josevalim Merge pull request #3186 from arunagw/void_context_warnings_removed_3…

Void context warnings removed 3 1 stable
Commits on Oct 02, 2011
@phuibonhoa phuibonhoa Added fix so that file store does not raise an exception when cache d…
…ir does not exist yet. This can happen if a delete_matched is called before anything is saved in the cache.

Signed-off-by: José Valim <>
@phuibonhoa phuibonhoa Improved testing so that it tests the real functionality and not the …
…private method.

Signed-off-by: José Valim <>
@josevalim josevalim TestCase should respect the view_assigns API instead of pulling varia…
…bles on its own.
@josevalim josevalim Provide initialize_on_precompile which, when set to false, does not i…
…nitialize the app for precompilation. Defaults to true.
@spastorino spastorino capture was commented out e6156cb
@spastorino spastorino Precompile properly refers files referenced with asset_path test d2219c5
@fxn fxn documents config.assets.initialize_on_precompile in the asset pipelin…
…e guide
@fxn fxn rewords the docs of config.assets.initialize_on_precompile in the ass…
…et pipeline guide
@josevalim josevalim :group => :assets should only run in the assets environment. ee8a37c
@josevalim josevalim Update sass and coffee dependencies to latest. 41cbd15
Commits on Oct 03, 2011
@spohlenz spohlenz Replace calls to capture(:stdout) with quietly in assets tests 29c2fc3
@spohlenz spohlenz Ensure that enhancements to assets:precompile task are only run once a6614c5
@josevalim josevalim Merge pull request #3192 from spohlenz/precompile-enhancement-fix
Fix regression in assets:precompile task when task is enhanced
@mjtko mjtko add failing test for #3198
Signed-off-by: José Valim <>
@josevalim josevalim Fix #3198. 2db49c5
@jeremy jeremy Merge pull request #2801 from jeremyevans/patch-1
Fix obviously breakage of Time.=== for Time subclasses
@abscondment abscondment Test demonstrating #3053: If-Modified-Since gets swallowed up by rack…

Signed-off-by: José Valim <>
@abscondment abscondment Require rack-cache 1.1.
Versions prior to 1.1 delete the If-Modified-Since and If-Not-Modified headers when
config.action_controller.perform_caching is true. This has two problems:
 * unexpected inconsistent behaviour between development & production environments
 * breaks applications that use of these headers

Signed-off-by: José Valim <>
Commits on Oct 04, 2011
@Empact Empact Changing rake db:schema:dump to run :environment as well as :load_con…
…fig, as running :load_config alone will lead to the dumper being run without including extensions such as those included in foreigner and spatial_adapter.

This reverses a change made here: 5df72a2#L0L324

I'm assuming here that :load_config needs to be invoked separately from :environment, as it is elsewhere in the file for db operations, if not the alternative is to go back to "task :dump => :environment do".
@josevalim josevalim Merge pull request #3208 from Empact/patch-1
Change rake db:schema:dump to load schema dumper extensions such as those used by foreigner and spatial_adapter
@josevalim josevalim Fix failing tests and refactor assets.rake 360b8c4
@spastorino spastorino Bump sprockets to 2.0.2 8bf761f
@mjtko mjtko add failing test: "digested assets are removed from configured path" 8093e38
@mjtko mjtko correct path used in "digested assets are not mistakenly removed" test a5eca91
@josevalim josevalim Merge pull request #3221 from mjtko/asset-tests
Failing test for assets:clean task issue
@josevalim josevalim Fix failing test added in previous commit. 4bc6e2f
@mjtko mjtko assets compilation task refactoring 63bab28
@mjtko mjtko don't munge the environment, let rake do that for us bbdb7f3
@mjtko mjtko only execute the nondigest task if needed 20173e2
@mjtko mjtko only reinvoke if necessary 45cdb3e
@mjtko mjtko added comment about why nondigest assets requires a reinvocation 871cbae
@josevalim josevalim Merge pull request #3225 from mjtko/assets-compilation-refactoring-th…

assets rake task refactoring work - the sequel
@josevalim josevalim Encapsulate common rake invocation logic in a method. 188d21c
Commits on Oct 05, 2011
@josevalim josevalim Ensure default_asset_host_protocol is respected, closes #2980. db8db4a
@josevalim josevalim Fix the lame config.action_controller.present? check scattered throug…
…hout assets_path.
@josevalim josevalim Fix regression when calling helpers inside sprockets. c6d13b6
@amatsuda amatsuda override unsafe methods only if defined on String 9257a21
@amatsuda amatsuda ruby193: String#prepend is also unsafe aa11f73
@josevalim josevalim Merge pull request #3230 from amatsuda/string_prepend_31
ruby193: String#prepend for 3-1-stable
@ugisozols ugisozols Class name specified in example is Person, not AttributePerson. 14e2fe2
@avakhov avakhov missed underscore in AV::TestCase helper_method documentation cf4d166
@spastorino spastorino stylesheet_link_tag('/stylesheets/application') and similar helpers d…
…oesn't throw Sprockets::FileOutsidePaths exception anymore
@jonleighton jonleighton Raise an exception on unknown primary key inside AssociationReflection.
An association between two models cannot be made if a relevant key is
unknown, so fail fast rather than generating invalid SQL. Fixes #3207.
@josevalim josevalim Revert "don't raise NoMethodError the tried method doesn't exists"
This reverts commit 29a5aea.
@spastorino spastorino Add missing CHANGELOG entried 162e13d
Commits on Oct 06, 2011
@spastorino spastorino Bumping to 3.1.1.rc3 57a01f3