Add task to clean only outdated assets #5782

Closed
wants to merge 580 commits into
from

Projects

None yet
@rhulse
Contributor
rhulse commented Apr 8, 2012

This covers the use-case where pages on the site have cache headers of (say) 5 minutes, and as a result remote clients still have references to assets from the most recent deploy.

In cases were the remote client has a cached copy of the page, but does not have a cached copy of the associated assets, the page will render with no CSS or JS after a deploy where the current clean task was used.

This new task keeps files from the most recent deploy (those in the manifest), and you precompile on top of those.

See #2962

guilleiguaran and others added some commits Feb 6, 2012
@guilleiguaran guilleiguaran Add branch to sass-rails and coffee-rails for apps generated with --d…
…ev or --edge options (3.2.x)
995c076
@tenderlove tenderlove Merge pull request #4912 from guilleiguaran/fix-edge-gemfile
Add branch to sass-rails and coffee-rails for apps generated with --dev or --edge (3-2-stable)
dd54137
@rmm5t rmm5t Fixed force_ssl redirects to include original query params
`ActionController.force_ssl` redirects http URLs to their https equivalent;
however, when a URL contains a query string, the resulting redirect lacked the
original query string.
391e6a4
@guilleiguaran guilleiguaran --edge option should generate app with rails 3-2-stable 5bfee55
@josevalim josevalim Merge pull request #4920 from guilleiguaran/revert-gemfile-edge
In Rails 3.2.x --edge generate apps with rails 3-2-stable
bc85fcb
@iblue @fxn iblue Fixed the documenation for 'to_xml' 8c7378a
@rmm5t rmm5t Added unit test to cover changes to RouteSet.url_for
ActionDispatch::Routing::RouteSet.url_for now handles passing params through to
ActionDispatch::Http::Url.url_for
0e482b3
@josevalim josevalim Merge pull request #4916 from rmm5t/fix_force_ssl_redirect_with_params
Fixed force_ssl redirects to include original query params
f3595b5
@fxn fxn no need to check for this constant dafc3c7
@tenderlove tenderlove always flush all logs. fixes #4277 b332877
@jonleighton jonleighton Fix attribute_before_type_cast for serialized attributes. Fixes #4837.
Conflicts:

	activerecord/lib/active_record/core.rb
77b4edc
@paul @josevalim paul Handle nil in add_index :length option in MySQL
Our schema.rb is being generated with an `add_index` line similar to this:

    add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil}

This is the same as it was on Rails 3.1.3, however, now when that
schema.rb is evaluated, its generating bad SQL in MySQL:

    Mysql::Error: You have an error in your SQL syntax; check the manual
    that corresponds to your MySQL server version for the right syntax
    to use near '))' at line 1: CREATE UNIQUE INDEX
    `xxx` ON `foo` (`foo`(8), `bar`())

This commit adds a check for nil on the length attribute to prevent the
empty parens from being output.

Conflicts:

	activerecord/test/cases/migration/index_test.rb

Signed-off-by: José Valim <jose.valim@gmail.com>
0a75336
@josevalim josevalim Push proper test changes for previous commit conflicts. d3d807a
@rafaelfranca rafaelfranca Use real table and columns for index test 7c167dd
@josevalim josevalim Merge pull request #4941 from rafaelfranca/fix-build
Use real table and columns for index test
6d17b36
@tenderlove tenderlove Merge pull request #4988 from kennyj/fix_4720-3
Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
73fcbaa
@jeremy @tenderlove jeremy Fix that failed tests should exit with a nonzero error code.
Partially reverts 14c89e7.

Hat tip to @tenderlove for paring down the TestTask!
92acd5d
@josevalim josevalim Fix deprecation warning in AS::Concern. 305d5d5
@josevalim @josevalim josevalim Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo
Always reenable _dump task in AR databases rake. Closes #5030
5f9a5a5
@spastorino spastorino Rack body respond to each and not to join
This fixes undef `to_str' for Rack::Chunked::Body when using
caches_action + streaming on an action

Closes #5027
7c79996
@tenderlove tenderlove adding tests to document behavior for #4817 201e67e
@josevalim @josevalim josevalim Merge pull request #5049 from fabioyamate/master
Fix sanitize_for_mass_assigment when role is nil
a1b9acb
@arunagw arunagw Fixes failing test with ruby 1.8.7-p358
Same as 91a9b24
c17608f
Aditya Sanghi backporting #4918 to 3.2 stable; adding extra test for accept header …
…given by googlebot
dffd85a
@josevalim josevalim Merge pull request #5073 from asanghi/4918_backport
Backporting #4918 with one added test for googlebot accept header as I saw it
45503ec
@spastorino spastorino Merge pull request #5071 from arunagw/fix_failing_test_ruby187_p358
Fix failing test ruby187 p358
1a0bc2a
@pixeltrix pixeltrix Fix ActionDispatch::Static to serve files with unencoded PCHAR
RFC 3986[1] allows sub-delim characters in path segments unencoded,
however Rack::File requires them to be encoded so we use URI's
unescape method to leave them alone and then escape them again.

Also since the path gets passed to Dir[] we need to escape any glob
characters in the path.

[1]: http://www.ietf.org/rfc/rfc3986.txt
86d3bc3
@pixeltrix pixeltrix Simplify regexp 1b4e6ca
@arunagw arunagw fix test with ruby 187-p358 742b615
@fxn fxn Merge pull request #5081 from arunagw/fix_ar_test
Fix ar test
3b61efc
@lest @vijaydev lest fix spacer template example ed3a15d
@oestrich @vijaydev oestrich Update Time#change docs to reflect the options it uses
[ci skip]
ea54d2c
@avakhov @vijaydev avakhov Fix actionpack readme weblog example 168e653
@ffmike @vijaydev ffmike Documenting the :inverse_of option for associations 44849b1
@vijaydev vijaydev fix a typo [ci skip] b2e9bbd
@pwnall pwnall Removed (outdated?) config.action_view.logger from configuration guide. 64fa7f7
@pixeltrix pixeltrix Remove fixture files with Windows incompatible filenames
Windows doesn't allow `\ / : * ? " < > |` in filenames so create
the fixture files at runtime and ignore the incompatible ones when
running on Windows.
41c182c
@funny-falcon @tenderlove funny-falcon sync __run_callbacks with ruby-trunk
https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580
In this revision behavior of respond_to? had changed: now to ask about
protected method one should pass second argument `true`
0c0f278
@tenderlove tenderlove search private / protected methods in trunk ruby 3b824d6
@ckdake ckdake Reset memoized hash keys when new entry added 68d3a46
@josevalim josevalim Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset
Reset memoized hash keys when new ActionView::Template handler is registered
8c870f1
@spastorino spastorino Use the right format when a partial is missing.
Closes #5025
8b86259
@spastorino spastorino Fix a failing test b80d8f7
@lest @tenderlove lest fix output safety issue with select options 7b73913
@amatsuda @tenderlove amatsuda add AS::SafeBuffer#clone_empty 621d219
@amatsuda @tenderlove amatsuda use AS::SafeBuffer#clone_empty for flushing the output_buffer 42fabd2
@amatsuda @tenderlove amatsuda delete vulnerable AS::SafeBuffer#[] dfa33fa
@kennyj kennyj Fix some warnings on 3-2-stable 39d4617
@spastorino spastorino Merge pull request #5106 from kennyj/fix_warnings_20120210
[3-2-stable] Fix some warnings
c426591
@spastorino spastorino Add CHANGELOG entry b122968
@spastorino spastorino Restore lookup formats to the previous value after searching for the …
…failing view
4eff6bc
@tenderlove tenderlove Merge pull request #5096 from lawso017/master
Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
d70ed10
@spastorino spastorino Don't wrap the raise with ensure f92c812
@vijaydev vijaydev fix bad docs from f373f29 [ci skip] cc848d6
@tenderlove tenderlove ruby 2.0 makes protected methods return false for respond_to, so pass…
… true as the second param
0052d90
@tenderlove tenderlove more ruby 2.0 respond_to? changes c73f883
@tenderlove tenderlove tag bind params with a bind param object a566ee5
@tenderlove tenderlove prepared statements can be disabled 83e42d5
@tenderlove tenderlove bumping up arel 35626fe
@spastorino spastorino format lookup for partials is derived from the format in which the te…
…mplate is being rendered

Closes #5025 part 2
19433ce
@spastorino spastorino Add CHANGELOG entry 110b43c
@spastorino spastorino Fix CHANGELOG 82d6ded
@tenderlove tenderlove updating RAILS_VERSION 4bcd437
@tenderlove tenderlove Merge pull request #5084 from johndouthat/patch-1
Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
fadad9f
@tenderlove tenderlove Merge pull request #5084 from johndouthat/patch-1
Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
93f1667
@tenderlove tenderlove Merge pull request #5087 from pwnall/no_view_logger
Remove reference to config.action_view.logger from Rails configuration guide
c5c3274
@josevalim josevalim Avoid inspecting the whole route set, closes #1525 419040f
@tenderlove tenderlove Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_pr…
…epare

Fix usage of psql in db:test:prepare
6dbf6f3
@tenderlove tenderlove Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_pr…
…epare

Fix usage of psql in db:test:prepare
ecff25c
@arunagw arunagw Build fix for ruby187-p358 99fa8e5
@fxn fxn Merge pull request #5164 from arunagw/build_fix_ruby187-p358
Build fix ruby187 p358
5661dab
@arunagw arunagw Checking headers in a better way. as doing here 0bfcd4f
@fxn fxn Merge pull request #5166 from arunagw/3-2-stable
3 2 stable
8125304
@arunagw arunagw assert => assert_equal a9b1397
@spastorino spastorino Merge pull request #5170 from arunagw/3-2-stable
assert => assert_equal
0a1357b
@noahhendrix @vijaydev noahhendrix Fixed typo in composed_of example with Money#<=>, was comparing amoun…
…t itself instead of other_money.amount
e1f799a
@glitterfang @vijaydev glitterfang Fix typo in match :to docs b229bc7
@RalphShnelvar RalphShnelvar Fixing Windows asset tag helper test failure
In asset_tag_helper_test.rb there is an assert on the number of bytes in a
concatenated file.  This test failed because Windows converts \n to \r\n as
the default for "w".  This is different than in *nix systems where there is
no conversion done.

THe test that failed was test_caching_stylesheet_link_tag_when_caching_on

Using bin mode fixes this behavior on windows and makes no change on the
*nix systems.
06dc8ed
@pixeltrix pixeltrix Adding tests for non-optional glob parameters b8c4f2d
@rafaelfranca @tenderlove rafaelfranca Revert "No need to pass options which is never used"
Options is needed for some Rails extensions to determine when
referential integrity should be disabled

This reverts commit bcb466c.

Fixes #5052
663904f
@rafaelfranca rafaelfranca Add a new line after the textarea opening tag.
Closes #393
2b4e7a7
@tenderlove tenderlove Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug
Binary mode window bug
b543f8f
@tenderlove tenderlove Merge pull request #5190 from rafaelfranca/fix-393-3-2-stable
[3-2-stable] Add a new line after the textarea opening tag.
210c33f
@tenderlove tenderlove call binmode on the tempfile for Ruby 1.8 compatibility 72ae0b4
@kennyj kennyj Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. f1f2e8c
@tenderlove tenderlove Merge pull request #5206 from kennyj/fix_5173-32
[3-2-stable] Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931
5bb5780
@josevalim @tenderlove josevalim Ensure [] respects the status of the buffer. 55ac1b9
@tenderlove tenderlove Merge branch '3-2-stable-security' into 3-2-2
* 3-2-stable-security:
  Ensure [] respects the status of the buffer.
  delete vulnerable AS::SafeBuffer#[]
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
c60c1c0
@tenderlove tenderlove bumping to 3.2.2 01b470f
@tenderlove tenderlove Merge branch '3-2-2' into 3-2-stable
* 3-2-2:
  bumping to 3.2.2
  Ensure [] respects the status of the buffer.
  Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare
  Merge pull request #5084 from johndouthat/patch-1
  updating RAILS_VERSION
  delete vulnerable AS::SafeBuffer#[]
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
c289790
@fxn fxn revert setting NOT NULL constraints in add_timestamps
Commit 3dbedd2 added NOT NULL constraints both to table
creation and modification. For creation the new default
makes sense, but the generic situation for changing a
table is that there exist records. Those records have
no creation or modification timestamps, and in the
general case you don't even know them, so when updating
a table these constraints are not going to work. See
a bug report for this use case in #3334.
bbe7dac
@drogus @spastorino drogus Fix #5238, rendered_format is not set when template is not rendered 1a71e84
@carlosantoniodasilva @drogus carlosantoniodasilva Stop SafeBuffer#clone_empty from issuing warnings
Logic in clone_empty method was dealing with old @dirty variable, which
has changed by @html_safe in this commit:
rails@139963c

This was issuing a "not initialized variable" warning - related to:
rails#5237

The logic applied by this method is already handled by the [] override,
so there is no need to reset the variable here.
5fd3601
@spastorino spastorino Add CHANGELOG entry 8674823
@tenderlove tenderlove only log an error if there is a logger. fixes #5226
Conflicts:

	activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
af02291
@spastorino spastorino Turn off verbose mode of rack-cache, we still have X-Rack-Cache to ch…
…eck that info

Closes #5245
520571a
@vijaydev vijaydev CSS fix for guides. Closing #5028 [ci skip]
In Ubuntu Chrome, in the last lines of code blocks, the underscore isn't
visible. Increasing the line height slightly seems to fix this. This
problem doesn't exist in Firefox even on Ubuntu. Too lazy to test in
any other OS-browser combo :)
23ca13a
@larskanis @drogus larskanis fix associations when using per class databases
would get ConnectionNotEstablished error because it always tried to use
ActiveRecord::Base's connection, even though it should be using the connection
of the model whose context we're operating in
f6d478a
@carlosantoniodasilva @drogus carlosantoniodasilva Only run binary type cast test with encode! on Ruby 1.9 864d755
@NZKoz NZKoz Whitelist all attribute assignment by default.
Change the default for newly generated applications to whitelist all attribute assignment.  Also update the generated model classes so users are reminded of the importance of attr_accessible.
06a3a8a
@khustochka
Contributor

I wonder what happens in terms of graceful degradation then. With JavaScript off will the form remain protected from forgery?

Member

In one of the next commits there is an option added to pass authenticity_token: true in order to keep that behavior.

Contributor

Thanks, drogus. My fault, I must have looked at the next commit.

Contributor

Not trolling here, but wouldn't this change (and the one in the next commit), break a lot of code where people do The Right Thing, and make their forms unobtrusive with graceful degradation?

I am not protesting the commit, just the fact that it was included in a patch version update (3.2.3) and it has the potential to catch a lot of people unawares...

Member

👍 to preserve the original behavior for 3-2-stable. We could use a config option to disable 'em instead.

Member

@christos fixed here: d646d9d, thanks for reporting!

dhh and others added some commits Mar 20, 2012
@dhh dhh We dont need to merge in the parameters as thats all being reset by t…
…he rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)
275ee0d
@mhfs mhfs [3-2-stable] Remove blank line from generated migration 57c6b4c
@kennyj kennyj migrate(:down) method with table_name_prefix 565bfb9
@josevalim josevalim Merge pull request #5533 from mhfs/migration_blank_line_3_2
[3-2-stable] Remove blank line from generated migration
f829515
@mhfs mhfs [3-2-stable] Port of #5522 'Fix adding/removing field's index when ge…
…nerating migration'
35bf748
@drogus drogus Merge pull request #5542 from mhfs/port_5522_to_32stable
Port of #5522 'Fix adding/removing field's index when generating migration'
89f8866
@kennyj kennyj Fix GH #5411. When precompiling, params method is undefined. 8c262f7
@josevalim josevalim Merge pull request #5525 from kennyj/fix_5411
Fix GH #5411. When precompiling, params method is undefined.
b714140
@carlosantoniodasilva carlosantoniodasilva Add order to tests that rely on db ordering, to fix failing tests on pg
Also skip persistente tests related to UPDATE + ORDER BY for postgresql

PostgreSQL does not support updates with order by, and these tests are
failing randomly depending on the fixture loading order now.
b332891
@tenderlove tenderlove Merge pull request #5557 from carlosantoniodasilva/fix-build-3-2
Fix build for branch 3-2-stable
ea4e021
@carlosantoniodasilva carlosantoniodasilva Fix identity map tests 0879ebd
@drogus drogus Merge pull request #5558 from carlosantoniodasilva/fix-build-3-2
Fix build for branch 3-2-stable - Part 2
ef48cea
@tenderlove tenderlove Merge pull request #5537 from kennyj/fix_4399-32
[3-2-stable] migrate(:down) method with table_name_prefix
0382e44
@tenderlove tenderlove chdir before globbing so that we don't need to escape directory names.
fixes #5521
eb0d8ee
@carlosantoniodasilva carlosantoniodasilva Return the same session data object when setting session id
Make sure to return the same hash object instead of returning a new one.
Returning a new one causes failures on cookie store tests, where it
tests for the 'Set-Cookie' header with the session signature.

This is due to the hash ordering changes on Ruby 1.8.7-p358.
907bcce
@abevoelker @vijaydev abevoelker Fix 'Security#Mass Assignment' URL typo ed7567c
@lest lest apply form_for namespace option to date_select bd8a970
@fesplugas

s/@glob/glob/

Member

actually the glob argument could be removed from both methods, couldn't it? /cc @tenderlove

Member

Thanks @fesplugas. @drogus actually I wanted to pass the glob in as a parameter in order to keep the method isolated from the class. I hope to eventually remove these methods.

Edited for clarity.

drogus and others added some commits Mar 26, 2012
@drogus drogus Merge pull request #5596 from lest/patch-3
apply form_for namespace option to date_select
3f1b8c6
@josevalim josevalim Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2
Fix build for branch 3-2-stable - return the same session hash object
0e916ae
@tenderlove tenderlove Merge pull request #2621 from icco/master
Issue with schema dump
3eb5be6
@drogus drogus If partial is rendered in controller, grab format from template
Previously `rendered_format` was set only based on mime types
passed in Accept header, which was wrong if first type from
Accept was different than rendered partial. The fix is to simply
move setting rendered_format to the place where template
is available and grab format from the template. If it fails
we can fallback to formats passed by Accept header.
449a4fc
@josevalim josevalim Merge pull request #5603 from drogus/fix-rendered-format-for-render-p…
…artial

Fix rendered format for render partial
e31ec47
@kryzhovnik kryzhovnik Fixing issue #2492. ActionView::Base.field_error_proc doesn't call fo…
…r label.

objectify_options method should be applied to the proper options arg.

See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
7111133
@spastorino spastorino Bumping to 3.2.3.rc1 5f37260
@lest lest force datetime attributes to be changed
backport ddb5d2f to 3-2-stable
fdcfc75
@drogus drogus Merge pull request #5618 from lest/patch-1
force datetime attributes to be changed
c4048b3
@jcoleman jcoleman Don't break Haml with textarea newline fix.
See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.)

Also fix 6 more tests that didn't yet have the newline expectation.
a7a422e
@tenderlove tenderlove adding a branch to arel 24208d9
@spastorino spastorino Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml
Textarea newline fix breaks haml (3-2-stable)
d82e4c8
@spastorino spastorino Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml
Textarea newline fix breaks haml (3-2-stable)
4f66586
@rafaelfranca rafaelfranca Check if the options hash already exists and merge it with the another
hash.

Closes #2492 and #5614
6968bc1
@jeremy jeremy Merge pull request #5622 from rafaelfranca/fix-2492-3-2
[3-2-stable] Fix label_tag to merge the options hash with the object hash
460d2c7
@rafaelfranca rafaelfranca Add arel branch to the tests 79c8def
@NZKoz NZKoz Merge pull request #5624 from rafaelfranca/fix-build
Fix build
f8b4ef1
@spastorino spastorino Merge pull request #5616 from cbartlett/migration-indent
Fix indenting in migration generator
2d5b60e
@drogus drogus Added config.action_view.embed_authenticity_token_in_remote_forms
There is a regression introduced in 16ee611, which breaks
remote forms that should also work without javascript. This commit
introduces config option that allows to configure this behavior
defaulting to the old behavior (ie. include authenticity token
in remote forms by default)
d646d9d
@spastorino spastorino Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms
Embed auth token in remote forms
0d052c0
@spastorino spastorino Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms
Embed auth token in remote forms
84ca8c8
@tenderlove @jonleighton tenderlove Test for #5549.
Cherry-picked from e96d04a.

Conflicts:

	activerecord/lib/active_record/attribute_methods/read.rb
4c44ca5
@jonleighton jonleighton Fix #5549. 1b9fd79
@exviva

What's the sense of this code? I know that's how it used to be, I'm just curious, maybe it didn't make sense before. It seems to me that it's deleting a value from a hash and immediately assigning it back under the same key.

On a side note, what's the rationale behind not including authenticity_token for AJAX forms? If it doesn't hurt, maybe it doesn't make sense to have this conditional, and an extra config option, and another option for form_for.

Member

On a side note, what's the rationale behind not including authenticity_token for AJAX forms?
If it doesn't hurt, maybe it doesn't make sense to have this conditional, and an extra config
option, and another option for form_for.

It can hurt if you cache the form. If you use ajax only you will get auth token from meta tags anyway, so it matters only if you want to also handle the form without javascript. also, see this: d646d9d

Contributor

Don't the UJS drivers override the authenticity_token hidden input's value with the meta tag's value anyway?

I was referring to your commit when mentioning the extra config option. All in all, I'm still trying to fully understand this change - thanks for the information.

Member

Don't the UJS drivers override the authenticity_token hidden input's value with the meta tag's value anyway?

Frankly, I'm not sure :)

Member

But even if yes, you don't necessarily need to use UJS drivers. We can't rely on it.

drogus added some commits Mar 28, 2012
@drogus drogus Cover one more case in auth_token and remote forms
If embedding auth_token in remote forms is off and we
pass a value for auth_token it should respect it.
d5980b5
@drogus drogus Cover one more case in auth_token and remote forms
If embedding auth_token in remote forms is off and we
pass a value for auth_token it should respect it.
db2c135
@khustochka
Contributor

Am I right this only goes to 3.2-stable but not to master?

Member

@khustochka it goes also to master, but will be set to false by default.

Contributor

@drogus thanks

yahonda and others added some commits Mar 28, 2012
@yahonda yahonda Change the order argument from ('id') to ('taggings.id')
to address ORA-00918 error
ef3f809
@spastorino spastorino Merge pull request #5640 from yahonda/address_ora_00918_with_oracle
Address an error for test_has_many_through_polymorphic_has_one with Oracle
f369f77
@spastorino spastorino Set proper rendered_format when doing render :inline
Closes #5632
5747e53
@spastorino spastorino Set proper rendered_format when doing render :inline
Closes #5632
87825a6
@andhapp andhapp Changed the config.assets.manifest to nil in the comments in the prod…
…uction config template.
a157d59
@spastorino spastorino Merge pull request #5644 from andhapp/fix-config-asset-manifest-3-2
Changed the config.assets.manifest to nil
2b2a760
@vijaydev vijaydev fix incorrect url in the deprecation message for vendor/plugins [ci s…
…kip]
1d753ab
@vijaydev @spastorino vijaydev fix incorrect url in the deprecation message for vendor/plugins [ci s…
…kip]
921c404
@spastorino spastorino Add missing CHANGELOG entry dd69076
@spastorino spastorino Add missing CHANGELOG entry b395ca1
@spastorino spastorino Bumping to 3.2.3.rc2 5284e65
@arturopie arturopie Adds a test that breaks IM when using #select b29e868
@arturopie arturopie Do not add record to identity map if the record doesn't have values f…
…or all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
2c8f84d
@arturopie arturopie refactor the checking of the attributes of the record in IdentityMap#…
…add, so it's more readable
714a2c8
@arturopie arturopie refactor instantiate method in base, so we remove nesting if's which …
…make the code harder to read. Minor changes to contain_all_columns in IdentityMap.

Conflicts:

	activerecord/lib/active_record/base.rb
6896cd4
@spastorino spastorino Remove the leading \n added by textarea on assert_select 13fe190
@spastorino spastorino Remove the leading \n added by textarea on assert_select 5c7bb86
@jonleighton jonleighton Fix #5667. Preloading should ignore scoping.
Conflicts:

	activerecord/test/cases/associations/eager_test.rb
dffbb52
@hkarthik

+1 to this. This is also problematic on old tables that were designed for HABTM relationships.

spastorino and others added some commits Mar 30, 2012
@spastorino spastorino Bump up to 3.2.3 45d6cd9
@spastorino spastorino Merge branch '3-2-3' into 3-2-stable 69465d9
@tenderlove tenderlove Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find…
…_select

Fixing Identity Map when using find select in rails 3.2
9894d16
@rafaelfranca @drogus rafaelfranca Fix the redirect when it receive blocks with arity of 1.
Closes #5677
27fc6ec
@drogus drogus Usage file in generators shouldn't be fetched only based on source_root
In case `source_roout` is not set, `default_source_root` is used,
which includes also `templates` directory. If there is no `templates`
directory, `default_source_root` is not available and USAGE will not
be displayed. USAGE should be also checked based on default
directory excluding `templates`.
515e1d3
@parndt
Contributor
parndt commented on a7a422e Apr 2, 2012

Possible regression in resolve/refinerycms-blog#216 ?

Contributor

Commented on refinery cms issue.

tpope and others added some commits Apr 3, 2012
@tpope @tenderlove tpope DATABASE_URL allows omission of database.yml 8e315b0
@hone hone test initializer logic for DATABASE_URL env var 93f25ac
@hone hone log which config format AR uses to connect with d46ad34
@tenderlove tenderlove Merge pull request #5727 from hone/ar_database_url_logging
ActiveRecord configuration logging
c4d3102
@spastorino spastorino Merge pull request #5188 from jlxw/patch-1
logger.silence is deprecated
6663dd0
@rafaelfranca rafaelfranca Fix tests of benchmark with silence equals to true 1124ac0
@spastorino spastorino Merge pull request #5737 from rafaelfranca/3-2-stable
Fix tests of benchmark with silence equals to true
56d9945
@anildigital anildigital Fix Rails version in getting started guide. 1cd939a
@vijaydev vijaydev Merge pull request #5765 from anildigital/3-2-stable
Update getting started guide to change Rails version to Rails 3.2
bfd5c84
@anildigital @vijaydev anildigital Fix 'Everyday Git' link 05d4ccf
@rhulse rhulse Add task to clean only outdated assets
This covers the use-case where pages on the site have cache headers of (say) 5 minutes, and as a result remote clients stil have references to assets from the most recent deploy. This keeps files from the most recent deploy.
aa7bda3
@rafaelfranca
Member

Sorry, but this pull request need to be rebased with master.

@rhulse
Contributor
rhulse commented Apr 9, 2012

I did it against the 3.2 branch because the Sprockets integration has been extracted into a gem on master. Should I perhaps do a pull request against the gem instead?

@rafaelfranca
Member

I see. You need to open a pull request in the gem. If the Core team agree that this patch should be applied in 3-2-stable they will ask you to open another pull request for that branch.

@rhulse
Contributor
rhulse commented Apr 9, 2012

OK, thanks!

@rhulse rhulse closed this Apr 9, 2012
@tiegz

@tenderlove this is prob a dumb question, but just wanted to make sure that shift is intended for binds and not *binds? I noticed just now that this to_sql method will alter the binds param for anything that uses binds after this is called.

Member

yes, the shift is indented for binds. Binds is a list of tuples, so the * is for expanding the tuple for the quote method.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment