Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

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.
base fork: rails/rails
...
head fork: rails/rails
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Jan 27, 2012
@jonleighton jonleighton Merge pull request #4715 from pwim/find-create-multi-args
Fix regression from Rails 3.1
1c5bd8a
Tadas Tamošauskas check_box helper with :disabled => true generates disabled hidden fie…
…ld. fixes #1953
19be5ea
@dmathieu dmathieu don't set the hidden checkbox value if it's nil defb751
@josevalim josevalim Merge check box fixes from remote-tracking branch 'cantonio/checkbox-…
…hidden-backport' into 3-2-stable
2e5ec3b
@dhh dhh Revert "Fix expanding cache key for single element arrays"
This reverts commit abe915f.

This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key.
66b445c
@dhh dhh Inline the prefix assignment so it doesnt look so daft f78cb55
Commits on Jan 30, 2012
@vijaydev vijaydev fix typo [ci skip] 766e12a
@fxn fxn query cache instrumentation should included the bindings in the paylo…
…ad [closes #4750]
4137905
Commits on Jan 31, 2012
@bsodmike bsodmike clarification to prevent confusing newbies; Passenger/Unicorn are app…
… servers, Apache/Nginx are the web servers along with thin a la Heroku etc.
93306be
@jonleighton jonleighton Merge pull request #4763 from kennyj/fix_4754
[MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
c472843
@jonleighton jonleighton Add workaround and deprecation if the inherited hook is not executed.…
… Closes #4757.
0bfc504
@jonleighton jonleighton Allow writing unknown attributes, but with a deprecation warning. Clo…
…ses #4583.
b2955ed
@lest lest fix assets test cfea673
@josevalim josevalim Merge pull request #4786 from lest/patch-2
fix assets test in 3-2-stable
175cdd1
@kennyj kennyj Fix GH #4760. A Block was not evaluated. 91700bf
@marten marten Fix use of Deprecation without requiring active_support/deprecation i…
…n ActiveSupport::Concern
cb46423
@marten marten Fix use of Deprecation without requiring active_support/deprecation i…
…n ActiveSupport::Concern in Base64
563be40
@marten marten Fix use of Deprecation without requiring active_support/deprecation i…
…n message verifier
f3e1b21
@marten marten Fix use of Deprecation without requiring active_support/deprecation i…
…n whiny nil
2380a2d
@josevalim josevalim Merge pull request #4790 from marten/fix-require-deprecation-in-activ…
…esupport

Fix Deprecation usage in ActiveSupport when requiring only parts of AS
7beb5a7
@jonleighton jonleighton Merge pull request #4783 from gregolsen/ids_reader_fix
ids_reader method fixed, test added to has_many association (for PostgreSQL)
85c724d
@josevalim josevalim Merge pull request #4793 from kennyj/fix_4760
[3-2-stable] Fix GH #4760. A Block was not evaluated.
bd93ba5
@tenderlove tenderlove Merge pull request #4779 from bsodmike/bsodmike-3-2-stable
Update comment in Gemfile re Unicorn (minor clarification)
60cb7d6
@tenderlove tenderlove Merge pull request #4735 from arton/master
Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows
81f14a5
@jonleighton jonleighton Improve deprecation message e1de540
Commits on Feb 01, 2012
@rafaelfranca rafaelfranca Fix broken tests added by 85c724d f532cd1
@spastorino spastorino Merge pull request #4811 from rafaelfranca/3-2-stable-fix
Fix broken build in 3-2-stable branch
1444ec6
@kennyj kennyj Fix GH #4749. Remove branch options, because edge is not 3-2-stable. c8c8439
@carlosantoniodasilva carlosantoniodasilva Generate strict validation error messages with attribute name
Backported from master.
91f8cf2
@spastorino spastorino Merge pull request #4815 from kennyj/fix_4749
Fix GH #4749. Remove branch options, because edge is not 3-2-stable.
21735d2
@josevalim josevalim Merge pull request #4822 from carlosantoniodasilva/strict-validation-3-2
Generate strict validation error messages with attribute name (3-2-stable)
0696a51
@sikachu sikachu Fix plugin_new test failure from c8c8439
`plugin_new` generator doesn't generate `sass-rails` in the Gemfile, so
you can't check for that.
b673ca6
@josevalim josevalim Merge pull request #4827 from sikachu/3-2-stable-fix-plugin-new
Fix plugin_new test failure from c8c8439
780bf52
@jonleighton jonleighton Merge pull request #4543 from jdelStrother/find_or_init
Don't instantiate two objects in collection proxy / find_or_instantiate_by
42dab64
Commits on Feb 02, 2012
@tenderlove tenderlove Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption
Fix for SQLite binary data corrupter (to master branch)
4ca633e
Commits on Feb 03, 2012
@skult skult Fix Issue #4819
'uninitialized constant ActiveRecord::Deprecation in Rails3.2.1'

Just a typo of 'ActiveSupport::...'
daa2665
@tenderlove tenderlove Merge pull request #4868 from skult/3-2-stable
Fix Issue #4819
9aa4c6d
@sikachu sikachu Fix override API response bug in respond_with
Default responder was only using the given respond block when user
requested for HTML format, or JSON/XML format with valid resource. This
fix the responder so that it will use the given block regardless of the
validity of the resource. Note that in this case you'll have to check
for object's validity by yourself in the controller.

Fixes #4796
567ac65
Commits on Feb 04, 2012
@fxn fxn let automatic EXPLAIN ignore CACHE notifications ee6e3c1
@josevalim josevalim Merge pull request #4879 from kennyj/fix_4873
Fix GH #4873. Allow swapping same class middleware.
9cb0e12
@josevalim josevalim Merge pull request #4870 from sikachu/3-2-stable-responder-fix
Fix override API response bug in respond_with
44b9992
@josevalim josevalim Clean up a bit default_response handling and cache format negotiation. 2bf2055
Commits on Feb 05, 2012
@kennyj kennyj GH #4883. Optional start_day argument for Time#all_week b037401
@spastorino spastorino Merge pull request #4890 from kennyj/improvement_4883
GH #4883. Optional start_day argument for Time#all_week
93f5361
Commits on Feb 06, 2012
@josevalim josevalim Merge pull request #4908 from kennyj/fix_3864
Fix url_for method's behavior. GH #3684.
ab44418
@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
Commits on Feb 07, 2012
@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 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
Commits on Feb 08, 2012
@paul 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
Commits on Feb 10, 2012
@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 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
Commits on Feb 13, 2012
@josevalim josevalim Fix deprecation warning in AS::Concern. 305d5d5
Commits on Feb 14, 2012
@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
Commits on Feb 15, 2012
@tenderlove tenderlove adding tests to document behavior for #4817 201e67e
@josevalim josevalim Merge pull request #5049 from fabioyamate/master
Fix sanitize_for_mass_assigment when role is nil
a1b9acb
Commits on Feb 17, 2012
@arunagw arunagw Fixes failing test with ruby 1.8.7-p358
Same as 91a9b24
c17608f
@asanghi asanghi 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
Commits on Feb 18, 2012
@arunagw arunagw fix test with ruby 187-p358 742b615
@fxn fxn Merge pull request #5081 from arunagw/fix_ar_test
Fix ar test
3b61efc
@avakhov avakhov Fix actionpack readme weblog example 168e653
@oestrich oestrich Update Time#change docs to reflect the options it uses
[ci skip]
ea54d2c
@lest lest fix spacer template example ed3a15d
@ffmike ffmike Documenting the :inverse_of option for associations 44849b1
@vijaydev vijaydev fix a typo [ci skip] b2e9bbd
Commits on Feb 19, 2012
@pwnall pwnall Removed (outdated?) config.action_view.logger from configuration guide. 64fa7f7
Commits on Feb 20, 2012
@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 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 lest fix output safety issue with select options 7b73913
Commits on Feb 21, 2012
@amatsuda amatsuda add AS::SafeBuffer#clone_empty 621d219
@amatsuda amatsuda use AS::SafeBuffer#clone_empty for flushing the output_buffer 42fabd2
@amatsuda 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
Commits on Feb 22, 2012
@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
Commits on Feb 23, 2012
@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
Commits on Feb 25, 2012
@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 noahhendrix Fixed typo in composed_of example with Money#<=>, was comparing amoun…
…t itself instead of other_money.amount
e1f799a
@glitterfang 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
Commits on Feb 26, 2012
@pixeltrix pixeltrix Adding tests for non-optional glob parameters b8c4f2d
@rafaelfranca 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
Commits on Feb 27, 2012
@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
Commits on Feb 28, 2012
@kennyj kennyj Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931. f1f2e8c
Commits on Feb 29, 2012
@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
Commits on Mar 01, 2012
@josevalim 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
Commits on Mar 02, 2012
@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 drogus Fix #5238, rendered_format is not set when template is not rendered 1a71e84
@carlosantoniodasilva 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:
139963c

This was issuing a "not initialized variable" warning - related to:
#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
Commits on Mar 03, 2012
@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
Commits on Mar 04, 2012
@larskanis 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 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
Commits on Mar 05, 2012
@rafaelfranca rafaelfranca Only add the whitelist_attributes option if ActiveRecord is present
Conflicts:

	railties/test/generators/app_generator_test.rb
	railties/test/isolation/abstract_unit.rb
f604a63
@rafaelfranca rafaelfranca Now all the models need to explicitly declare the accessible attributes 2a6b7e5
@NZKoz NZKoz Merge pull request #5278 from rafaelfranca/fix-build-3-2
[3-2-stable] Fix build
ebc5a19
@byroot byroot Fix #5069 - Protect foreign key from mass assignment throught associa…
…tion builder
e1a882a
Commits on Mar 06, 2012
@mariovisic mariovisic Failing test for mime responder respond_with using a block. 5b73a3a
@sikachu sikachu Always passing a respond block from to responder
We should let the responder to decide what to do with the given
overridden response block, and not short circuit it.

Fixes #5280
82a8698
@josevalim josevalim Merge pull request #5299 from sikachu/3-2-stable-fix-responder
Always passing a respond block from to responder
688e4f0
@mikel mikel Increasing minimum version of mail due to security vulnerability foun…
…d in Mail 2.4.1 for sendmail or exim
0d2798e
@josevalim josevalim Use latest rack-cache. 9c56401
@spastorino spastorino Deprecate ActionController::SessionManagement 74fe7e1
Commits on Mar 07, 2012
@josevalim josevalim Just change the formats on first render, closes #5307, closes #5308. bcea8cd
@josevalim josevalim Set the rendered_format on respond_to. e7560bc
@carlosantoniodasilva carlosantoniodasilva Add test case for #5307 b35fd40
@josevalim josevalim Remove usage of deprecated module. 3775058
@josevalim josevalim Merge pull request #5316 from Jacobkg/master
Update ActiveRecord::AttributeMethods#attribute_present? to return false for empty strings
524e8a1
@kuahyeow kuahyeow Add tests to test that through associations are not readonly, and we …
…can update the records we retrive from the association
9bcd662
Commits on Mar 08, 2012
@mreinsch mreinsch fix ArgumentError being raised in case of invalid byte sequences 55cac81
@carlosantoniodasilva carlosantoniodasilva Improve docs for attr_accessible|protected related to Hash#except|slice e63f04c
@Mik-die Mik-die typo 1f2224d
@swanandp swanandp Fixed a slightly misleading equivalent SQL code on the 3.2 query inte…
…rface.
30feb8c
@bschaeffer bschaeffer Fix doc examples for has_and_belongs_to_many association 357e288
@mattreduce mattreduce Fix typo in asset pipeline guide 061f8ae
@caius caius Fix typo in isolated engine docs 22a8433
@coreyhaines coreyhaines Left off a : when specifying the :namespace option for a :controller
path segment
df755d4
@vijaydev vijaydev In a nested resource route, the parent resource param is <resource_na…
…me>_id

This fix was made by @coreyhaines on docrails and merged in master.
Cleanly cherry picking into 3-2-stable wasn't possible.
c1a01c7
@vijaydev vijaydev changelog updates [ci skip] 3bfd651
@vijaydev vijaydev update changelogs for gems without changes too [ci skip] 263d842
@tenderlove tenderlove make active_connection? return true only if there is an open connecti…
…on in use for the current thread. fixes #5330
cff19cf
Commits on Mar 09, 2012
@tenderlove tenderlove ensure that released connections move between threads 94b2c8c
@rafaelfranca rafaelfranca Add test case to has_many through association when mass_assignment_sa…
…nitizer is

:strict

Conflicts:

	activerecord/test/models/person.rb
7cd4063
@rafaelfranca rafaelfranca Not need to pass join attributes to association build f18c054
@rafaelfranca rafaelfranca Fix my name in the CHANGELOG to follow the convention
Also add missing entries and use the formating convention
db743ff
@vijaydev vijaydev Merge pull request #5350 from rafaelfranca/changelog-fix-3-2
Changelog fix 3 2
9814420
@josevalim josevalim Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2
[3-2-stable] Fix has many through associations when mass_assignment_sanitizer is :strict
2b9041b
Commits on Mar 12, 2012
@pixeltrix pixeltrix Add dynamic find_or_create_by_{attribute}! method.
(cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d)

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/lib/active_record/dynamic_finder_match.rb
90d9635
@pixeltrix pixeltrix Add documentation for find_or_create_by_{attribute}! method. a01f0ab
@jrochkind jrochkind inline docs for clear_active_connections! no longer says it cleans de…
…ad threads, it doesn't since 3.2.0
bb8f4c2
@tenderlove tenderlove Merge pull request #5391 from jrochkind/connection_pool_doc
ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0
da0595d
@tenderlove tenderlove make sure connections returned after close are marked as in_use 5f26ce6
Commits on Mar 13, 2012
@parndt parndt Fixes issue #5193 using the instructions provided in the issue. f665e20
@parndt parndt Fixed problem when fixture_path is not always defined (incidentally, …
…only when ActiveRecord is according to test_help.rb).
5ef8069
@denisj denisj fix activerecord query_method regression with offset into Fixnum
add test to show offset query_methods on mysql & mysql2

change test to cover public API
f67944e
@josevalim josevalim Merge pull request #5400 from arunagw/issue_4409
Issue 4409
a9320f7
@josevalim josevalim Merge pull request #5398 from parndt/fix_issue_5193
Fix issue 5193
d2ac18a
@rafaelfranca rafaelfranca Do not use the attributes hash in the scaffold functional tests 5bed0e5
@rafaelfranca rafaelfranca Use the attributes hash explicitly ac8469d
@rafaelfranca rafaelfranca Use Ruby 1.8 hash syntax c1610eb
@josevalim josevalim Merge pull request #5410 from rafaelfranca/fix-scaffold-3-2
[3-2-stable] Do not use the attributes hash in the scaffold functional tests
dfbbf31
@kennyj kennyj [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::…
…Base::ConnectionSpecification objects.
21d9c0f
@avakhov avakhov Fix layout method doc formatting 5f28145
@britto britto Close string quotes a782fea
@tenderlove tenderlove Merge pull request #5417 from kennyj/fix_5399-32
[3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects.
596ecf7
@jrochkind jrochkind ConnectionPool.checkout takes account of ruby using 'non-blocking con…
…dition variables' in mutex ConditionVariables
41563b4
Commits on Mar 14, 2012
@tenderlove tenderlove Merge pull request #5423 from jrochkind/checkout_account_for_monitor_…
…model

ConnectionPool.checkout needs to be restructured to take account of ruby's "non-blocking" strategy for mutex ConditionVariables
f2aea24
@dhh dhh Do not include the authenticity token in forms where remote: true as …
…ajax forms use the meta-tag value
16ee611
@dhh dhh Allow you to force the authenticity_token to be rendered even on remo…
…te forms if you pass true
e50abba
Commits on Mar 15, 2012
@drogus drogus Remove ActionController::TestCase#rescue_action_in_public!
This method has no effect since exception handling was
moved to middlewares and ActionController tests do not
use any middlewares.
ccf4ff0
@drogus drogus Check for existence of exactly the called `fixture_path=` method 9dfb41f
@tenderlove tenderlove Merge pull request #5338 from mreinsch/3-2-static_invalid_byte_sequence
3 2 static invalid byte sequence
f918137
@tenderlove tenderlove Merge pull request #5437 from kennyj/fix_5430
Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.
bd3e1ed
@tenderlove tenderlove Merge pull request #5456 from brianmario/redirect-sanitization
Strip null bytes from Location header
f52ad6c
@tenderlove tenderlove Merge pull request #5457 from brianmario/typo-fix
Fix typo in redirect test
e135ff1
Commits on Mar 17, 2012
@drogus drogus Fix #5440 - multiple render_to_string breaks partials formats
This fixes situation where rendering template to string
sets `rendered_format` to the format rendered there.
This is ok to have consistent formats rendered in partials,
but it breaks on next renders if format is explicitly set
or on last render where default format does not necessarily
need to be the format of first rendered template.
1eb6189
@drogus drogus Add missing test for #5308 7130f91
@josevalim josevalim Merge pull request #5480 from drogus/rendering-issues
Fix for #5440
e5b46cf
@josevalim josevalim Ensure load hooks can be called more than once with different contexts. c0a5b85
@drogus drogus Rubyracer does not work on ruby, so add it to Gemfile with :ruby plat…
…form only
41815f5
Commits on Mar 18, 2012
@kennyj kennyj Fix GH #5435. db:structure:dump should be re-enable. f4f9ec1
@drogus drogus Merge pull request #5493 from kennyj/fix_5435-32
[3-2-stable] Fix GH #5435. db:structure:dump should be re-enable.
d9355be
@arunagw arunagw Build fix for app_generator_test.rb 9451201
@josevalim josevalim Merge pull request #5498 from arunagw/build_fix_app_generator_test_3-…
…2-stable

Build fix app generator test 3 2 stable
c8fbd48
Commits on Mar 19, 2012
@mikel mikel Increase minimum version of mail.
  Second security vulnerability found in mail file delivery method
  patched in version 2.4.4.
74b7829
@arunagw arunagw Build fix for ruby1.8.7-358 fcc8743
@josevalim josevalim Merge pull request #5505 from arunagw/build_fix_1.8.7-3-2-stable
Build fix 1.8.7 3 2 stable
358333f
Commits on 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
Commits on Mar 21, 2012
@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
Commits on Mar 22, 2012
@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
Commits on Mar 23, 2012
@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
Commits on Mar 24, 2012
@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
Commits on Mar 26, 2012
@abevoelker abevoelker Fix 'Security#Mass Assignment' URL typo ed7567c
@lest lest apply form_for namespace option to date_select bd8a970
@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
Commits on Mar 27, 2012
@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
@spastorino spastorino Bumping to 3.2.3.rc1 5f37260
@spastorino spastorino Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml
Textarea newline fix breaks haml (3-2-stable)
4f66586
Commits on Mar 28, 2012
@spastorino spastorino Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms
Embed auth token in remote forms
84ca8c8
@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
@spastorino spastorino Set proper rendered_format when doing render :inline
Closes #5632
87825a6
Commits on Mar 29, 2012
@vijaydev 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