Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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
This comparison is big! We're only showing the most recent 250 commits
Commits on Jul 23, 2012
@tenderlove tenderlove updating changelogs 125dfdf
@tenderlove tenderlove updating the version 753c546
Commits on Jul 25, 2012
@smartinez87 smartinez87 New #update_columns method. f27a8eb
@parndt parndt Suggest using update_columns instead of update_column.
update_column is deprecated in Rails 4.0 so it makes no sense to
recommend adopting it only to require changing to update_columns
in the very next release.
a0b85b9
@tenderlove tenderlove Merge pull request #7159 from parndt/update_columns
Backport update_columns to Rails 3.2
def9c85
Commits on Jul 26, 2012
@carlosantoniodasilva carlosantoniodasilva Fix AR#update_columns tests on Ruby 1.8.7 17a64de
@parndt parndt Switched update_column recommendation in changelog to update_columns
This is related to #7159
9fa06c3
@rafaelfranca rafaelfranca Merge pull request #7164 from parndt/patch-4
Switched update_column recommendation in changelog to update_columns
3dae440
@tenderlove tenderlove * Do not convert digest auth strings to symbols. CVE-2012-3424 27311fe
@tenderlove tenderlove updating the changelog fb89f6f
@tenderlove tenderlove bumping to 3.2.7 21bcac1
@tenderlove tenderlove updating release date d1b9cf2
@tenderlove tenderlove Merge branch '3-2-rel' into 3-2-stable
* 3-2-rel:
  updating release date
  bumping to 3.2.7
  updating the changelog
  * Do not convert digest auth strings to symbols. CVE-2012-3424
  updating the version
  updating changelogs
133754e
Commits on Jul 27, 2012
@rafaelfranca rafaelfranca Only require the `:rails_env` task where is needed.
`:rails_env` tasks is not needed in all the tasks that depends of
`load_config`, only in the tasks that uses `Rails.env`.

Since `:rails_env` task set the `Rails.env` to be "development" if it is
not set we don't need the `||` statements too

Fix #7175.
4b8b8c1
@fxn fxn adds a missing require from Active Support
This file uses mattr_accessor.
db340da
Commits on Jul 28, 2012
@fxn fxn missing require: the AR session store depends on the AP abstract store
This require makes the dependency even more clear.
In particular we are eager loading the session
store but that does not work if AR is used
outside Rails, this patch is preliminary work
in fixing #7160.
bf16456
Francesco Rodriguez Backport #6995 to 3-2 stable
Update `test_help` to config properly turn natural language option.
Last versions of Turn don't monkey patch MiniTest to setup
the natural language option. Here is an [example](https://github.com/TwP/turn/blob/master/try/test_autorun_minitest.rb#L3).

This patches the following behaviour:

    $ rake test:units
    `<top (required)>': undefined method `use_natural_language_case_names='
    for MiniTest::Unit:Class (NoMethodError)
3326b8b
@rafaelfranca rafaelfranca Merge pull request #7187 from frodsan/fix_test_help
Backport #6995 to 3-2 stable
be408d6
@fxn fxn removes the AR session store from eager loaded code [fixes #7160]
See the comment in the file activerecord/lib/active_record.rb
added by this patch for the rationale.
cc712f2
Commits on Jul 30, 2012
@rafaelfranca rafaelfranca Revert "Add update_columns and the suggestion of using update_columns
instead of update_column"

This reverts commit 9fa06c3.

This reverts commit 17a64de.

This reverts commit def9c85, reversing
changes made to 6b7d26c.

Reason: This was supposed to be released with 3.2.7 before the
suggestion to use update_column. Since it was not release now is not
good to suggest to use another method because it will confusing the
people.
2f930df
Commits on Jul 31, 2012
@rafaelfranca rafaelfranca Add CHANGELOG entry [ci skip] a893672
Commits on Aug 01, 2012
@rafaelfranca rafaelfranca Merge pull request #7147 from pferdefleisch/scaffold_controller_docs
Updated scaffold_controller generator docs #7146
69fd0e8
@rafaelfranca rafaelfranca Merge pull request #7070 from jmazzi/3-2-stable
Update documentation for Rails::Application#env_config
3e01a2a
@spastorino spastorino Add missing CHANGELOG entries
[ci skip]
6764b7b
@jonleighton jonleighton Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."
This reverts commit a79bfa9.

Conflicts:
	activerecord/CHANGELOG.md

We shouldn't introducing deprecations in point releases.
It will be deprecated in 4.0 instead.
0c52702
@rafaelfranca rafaelfranca Revert "Deprecating composed_of in ActiveRecord"
This reverts commit 44b313b.
736bf14
@rafaelfranca rafaelfranca Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Tex…
…t' }` option"

Revert "Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers."

This reverts commit fc092a9.
This reverts commit e9051e2.
This reverts commit d47d6e7.
This reverts commit 21141e7.
89177ba
@fxn fxn revises the deprecation warning of update_attribute
We have decided not to drop this important method in 4.0 and give
it a longer deprecation cycle. On the other hand we do not expect
to have update_column around for a long time, it is going to be
replaced in favor of update_columns.
f203be9
@fxn fxn removes the deprecation of update_attribute
Applying the new policy here to not deprecate stuff in point releases.
81542f9
@rafaelfranca rafaelfranca Fix CHANGELOGS 857697b
@rafaelfranca rafaelfranca Revert "Deprecate ActiveSupport::JSON::Variable"
This reverts commit bcfa013.
af65b8c
@rafaelfranca rafaelfranca Revert "Deprecate `:mouseover` options for `image_tag` helper."
This reverts commit 1aff772.

Conflicts:
	actionpack/CHANGELOG.md
e826a5c
@rafaelfranca rafaelfranca Revert "Deprecate link_to_function and button_to_function helpers"
This reverts commit 9dc57fe.
f50a5d2
@spastorino spastorino Bump to 3.2.8.rc1 fcccbac
@spastorino spastorino This entry is wrong 74cf196
Commits on Aug 02, 2012
@ffmike ffmike Fix ActiveSupport integration with Mocha > 0.12.1
Mocha 0.12.2 renames the Integration module to
MonkeyPatching. This breaks the code Rails uses
to retrieve the assertion counter from Mocha.
a252436
@carlosantoniodasilva carlosantoniodasilva Merge pull request #7235 from ffmike/mocha_12_2_compat
Fix ActiveSupport integration with Mocha > 0.12.1
5365c10
@kennyj kennyj Backport #5168 to 3-2-stable. Fix a problem that NULLS is ignored by …
…postgresql_adapter.rb while creating distincts.
f137c2b
@carlosantoniodasilva carlosantoniodasilva Merge pull request #7232 from kennyj/fix_7200
Fix #7200. Backport #5168 to 3-2-stable
59c4b22
@rafaelfranca rafaelfranca Do not consider the numeric attribute as changed if the old value is
zero and the new value is not a string.

Before this commit this was the behavior

r = Review.find_by_issue(0)
r.issue
=> 0
r.changes
=> {}
r.issue = 0
=> 0
r.changed?
=> true
r.changes
=> {"issue"=>[0,0]}

Fixes #7237
99f622d
@rafaelfranca rafaelfranca Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` at
the ERB scaffold generator.

We are trying to teach the data attributes as best practices and
`:confirm` will be deprecated in 4.0.
96e92b6
@ffmike ffmike Fix ActiveSupport integration with Mocha > 0.12.1
Mocha 0.12.2 renames the Integration module to
MonkeyPatching. This breaks the code Rails uses
to retrieve the assertion counter from Mocha.
5c42889
@rafaelfranca rafaelfranca Do not consider the numeric attribute as changed if the old value is
zero and the new value is not a string.

Before this commit this was the behavior

r = Review.find_by_issue(0)
r.issue
=> 0
r.changes
=> {}
r.issue = 0
=> 0
r.changed?
=> true
r.changes
=> {"issue"=>[0,0]}

Fixes #7237
55e05d4
@rafaelfranca rafaelfranca Use `:data => { :confirm => "Text" }` syntax instead of `:confirm` at
the ERB scaffold generator.

We are trying to teach the data attributes as best practices and
`:confirm` will be deprecated in 4.0.
9c1b1bd
@spastorino spastorino html_escape should escape single quotes
https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
Closes #7215

Conflicts:
	actionpack/test/template/erb_util_test.rb
	actionpack/test/template/form_tag_helper_test.rb
	actionpack/test/template/text_helper_test.rb
	actionpack/test/template/url_helper_test.rb
	activesupport/lib/active_support/core_ext/string/output_safety.rb
2bdb4ec
@spastorino spastorino html_escape should escape single quotes
https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content
Closes #7215

Conflicts:
	actionpack/test/template/erb_util_test.rb
	actionpack/test/template/form_tag_helper_test.rb
	actionpack/test/template/text_helper_test.rb
	actionpack/test/template/url_helper_test.rb
	activesupport/lib/active_support/core_ext/string/output_safety.rb
28f2c6f
@rafaelfranca rafaelfranca Fix html_escape with Ruby 1.8 2f4b82f
@rafaelfranca rafaelfranca Fix html_escape with Ruby 1.8 ebddf75
@rafaelfranca rafaelfranca More `:rails_env` cleanup.
`Rails.env` already use development if ENV["RAILS_ENV"] is not present.
e23b26c
@rafaelfranca rafaelfranca More `:rails_env` cleanup.
`Rails.env` already use development if ENV["RAILS_ENV"] is not present.
469d885
Commits on Aug 03, 2012
@josevalim josevalim Merge pull request #6084 from brainopia/support_for_magic_domain_on_a…
…ll_stores

Support cookie jar options for all cookie stores
393c652
@spastorino spastorino Add CHANGELOG entry 5f9ae95
@spastorino spastorino Bump to 3.2.8.rc2 65b5e35
Commits on Aug 05, 2012
@rafaelfranca rafaelfranca Revert "Merge pull request #6084 from brainopia/support_for_magic_dom…
…ain_on_all_stores"

This reverts commit 393c652.

This commit was supposed to fix a bug but it add more failures.
a48ea68
@rafaelfranca rafaelfranca Merge pull request #7140 from seamusabshere/patch-1
Make sure :environment task is executed before db:schema:load or
db:structure:load

Conflicts:
	activerecord/CHANGELOG.md
0fb6bbd
Commits on Aug 06, 2012
@sikachu sikachu Do not include application.js if it doesn't exists
Rails were including 'application.js' to the pack when using
`javascript_include_tag :all` even there's no application.js in the
public directory.
8e2a05b
@sikachu sikachu Rearrange example output of javascript_include_tag 6c46730
@rafaelfranca rafaelfranca Merge pull request #7276 from sikachu/3-2-stable-js-include-tag-fix
Do not include application.js if it doesn't exists
3cc872d
@josevalim josevalim Merge pull request #7167 from route/missed_extend
Missed extend for eager_autoload

This backport is trying to fix a bug with eager load
ActiveRecord::Associations modules
29fb31f
@tenderlove tenderlove Merge pull request #5872 from evtuhovich/prepared_statement_fix
Remove prepared statement from system query in postgresql adapter
Conflicts:
	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
a935c7a
@rafaelfranca rafaelfranca Add CHANGELOG entry for a935c7a ea48732
Commits on Aug 07, 2012
@josh josh Loosen sprockets version restriction 83e0c95
@dhh dhh Merge pull request #7283 from josh/bump-sprockets
Allow newer versions of Sprockets
185d74c
@tenderlove tenderlove make assertions easier to track down d498b5e
@josh josh Fix invalid asset compile assertions
Logical paths to compile should require an extension
635817e
@rafaelfranca rafaelfranca Merge pull request #7284 from josh/fix-asset-tests
Fix asset integration test (3-2-stable)
c35853f
@rafaelfranca rafaelfranca Remove references to old behavior with headers at
ActionDispatch::Integration::ResquestHelpers.

The behavior has removed at 4a6f4b9 to
increase the compatibility with Rack::Test

Closes #7136

[ci skip]
4147e0f
Commits on Aug 08, 2012
@rafaelfranca rafaelfranca Fix CHANGELOG [ci skip] 2e98e0f
Commits on Aug 09, 2012
@iHiD iHiD Ported PR #4856 to 3-2-stable. 2a6039a
@iHiD iHiD Backport #7173. af6dfdb
@rafaelfranca rafaelfranca Add CHANGELOG entry 5c2fc69
@rafaelfranca rafaelfranca Merge pull request #7299 from iHiD/3-2-stable-store
Ported PR #4856 to 3-2-stable.
0f9a6a7
@spastorino spastorino escape select_tag :prompt values
CVE-2012-3463
6d0526d
@spastorino spastorino Do not mark strip_tags result as html_safe
Thanks to Marek Labos & Nethemba

CVE-2012-3465
e91e4e8
@spastorino spastorino Add release date to CHANGELOGs ddedf5d
@spastorino spastorino Bump to 3.2.8 64146cf
@spastorino spastorino Merge branch '3-2-8' into 3-2-stable 7987e74
@amerine amerine Add html_escape note to CHANGELOG e8c0d73
@spastorino spastorino Merge pull request #7309 from amerine/3-2-stable
Add html_escape note to CHANGELOG
ae2383d
Commits on Aug 10, 2012
@brainopia brainopia Revert "Revert "Merge pull request #6084 from brainopia/support_for_m…
…agic_domain_on_all_stores""

This reverts commit a48ea68.
058dc9a
@brainopia brainopia Dont stream back cookie value if it was set to the same value bbe634e
@brainopia brainopia Test actual content of permanent cookie ca07bc0
@rafaelfranca rafaelfranca Merge pull request #7286 from kennyj/fix_7191
Fix #7191. Remove unnecessary transaction when assigning has_one associations.
Conflicts:
	activerecord/test/cases/associations/has_one_associations_test.rb
2e00074
@rafaelfranca rafaelfranca Add CHANGELOG entry for #7286 3307a2e
Commits on Aug 11, 2012
@drogus drogus [guides] Add info about CHANGELOGs to contributing guide dad717a
@brainopia brainopia Update changelog to reflect support of cookie jar options for all
session stores
2e04a34
@rafaelfranca rafaelfranca Merge pull request #7316 from brainopia/backport_fix_session_store_op…
…tions

Backport of "Support cookie jar options for all cookie stores" for 3.2-stable
20f18cb
Commits on Aug 12, 2012
@rafaelfranca rafaelfranca Merge pull request #6073 from daveyeu/restore-state-on-record-invalid
Restore state on create when ActiveRecord::RecordInvalid is raised
Conflicts:
	activerecord/CHANGELOG.md
786713a
Commits on Aug 15, 2012
@jeremy jeremy Backport 5c51cd0: #send_file leans on Rack::Sendfile to X-Accel-Redir…
…ect the file's path, so opening the file to set the response body is wasteful. Set a FileBody wrapper instead that responds to to_path and streams the file if needed.
bccc35b
@rafaelfranca rafaelfranca Do not use update_column where update_attribute is not interchangeable
Revert "Deprecate update_attribute."

This reverts commit b081f6b.

Reason: Since the new deprecation policy we removed the deprecation of
update_attribute but we didn't reverted the changes to use
update_column.

Fixes #7306
8055cd6
@carlosantoniodasilva carlosantoniodasilva Merge pull request #7027 from erichmenge/patch/jruby_send_file
Backport 5c51cd0 to fix an issue with jRuby encodings. Fixes #6844
b4dce47
@carlosantoniodasilva carlosantoniodasilva Remove duplicated changelog entry [ci skip] 4e31f82
Commits on Aug 17, 2012
@jonleighton jonleighton Use benchmark/ips to measure AR performance
This means we can more easily compare numbers, and we don't have to
specify a single N for all reports, which previously meant that some
tests were running many more/fewer iterations than necessary.
bfff0ed
@jonleighton jonleighton Increase benchmark time to 20 seconds.
I think that 5 seconds was a bit low for our purposes.

Also enable it to be configured via env vars.

We also need to scale the number of records up/down depending on how
long we're running the benchmark for.
25f6549
@rafaelfranca rafaelfranca Merge pull request #7352 from aripollak/microsecond-timestamp
Fix occasional microsecond conversion inaccuracy
Conflicts:
	activerecord/CHANGELOG.md
d6dbd7f
Commits on Aug 18, 2012
@rafaelfranca rafaelfranca Ruby 1.8 doesn't have to_r defined to NilClass and Float.
Use round to get the right conversion
3c61642
@jrafanie jrafanie Table#remove passed an array to remove_column, which is deprecated. 066ecf0
@rafaelfranca rafaelfranca Merge pull request #7388 from ManageIQ/fix_table_remove_passing_array…
…_deprecation

Table#remove passed an array to remove_column, which is deprecated.
b3bea49
Commits on Aug 21, 2012
@carlosantoniodasilva carlosantoniodasilva Merge pull request #7377 from brainopia/use_inversed_parent_for_first…
…_and_last_child

Use inversed parent for first and last child of has_many association

[Backport] Closes #3223.

Conflicts:
	activerecord/lib/active_record/associations/collection_association.rb
fdf4eae
@rafaelfranca rafaelfranca Merge pull request #6986 from kennyj/fix_6975
Fix #6975. Round usec when writing timestamp attribute.

Conflicts:
	activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
8905c1f
@rafaelfranca rafaelfranca Merge pull request #7410 from sandeepravi/default_options_helper_value
option_tags coerced to "" instead of nil

Closes #7404
c091fae
@rafaelfranca rafaelfranca Merge pull request #5210 from Pliny/masteri
Fix for #5200

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/counter_cache.rb
648c5a1
@rafaelfranca rafaelfranca Use a model without counter cache to test read-only attributes 015cac7
@carlosantoniodasilva carlosantoniodasilva Use Ruby 1.8 hash syntax
Introduced in backport 648c5a1.
d5fe242
Commits on Aug 24, 2012
@arunagw arunagw We need to have 1-0-stable for joureny gem in edge
Problem : Edge rails can't bundle
Fixes #7437
0ec7b35
@spastorino spastorino Merge pull request #7438 from arunagw/3-2-stable-edge-rails-fix
We need to have 1-0-stable for joureny gem in edge
b76a963
Commits on Aug 25, 2012
@nashby nashby correct handling of date selects when using both disabled and discard…
… options

we should take disabled option not only from `html_options` hash but from
`options` hash too like `build_select` method does it. So

datetime_select("post", "updated_at", { :discard_minute => true }, { :disabled => true })
datetime_select("post", "updated_at", :discard_minute => true , :disabled => true)

both these variants work now

closes #7431
4b19855
@rafaelfranca rafaelfranca Merge pull request #7446 from nashby/backport-fix-issue-7431
backport #7435
dcb2bee
Commits on Aug 28, 2012
@fxn fxn fixes a bug in dependencies.rb
loaded stores file names without the .rb extension, but search_for_file
returns file names with the extension.

The solution is hackish, but this file needs a revamp.
8333b93
@fxn fxn CHANGELOGs are now per branch
Check 810a50d for the rationale.
8efced6
@lifo lifo Ensure association preloading properly merges default scope and assoc…
…iation conditions

Conflicts:

	activerecord/test/models/reader.rb
58d35f6
Commits on Aug 29, 2012
@marcandre marcandre Fix bug when Rails.application is defined but is nil. See #881 728e925
@drogus drogus Merge pull request #7474 from steveklabnik/backport_89ebd28
Backport 89ebd28 to 3-2-stable
f84fc39
Commits on Aug 30, 2012
@fxn fxn documents after_(commit|rollback) cabab37
Commits on Sep 03, 2012
@senny senny set the configured #inheritance_column on #become (#7503)
I had to create a new table because I needed an STI table,
which does not have both a "type" and a "custom_type"

the test fails with:
  1) Error:
test_alt_becomes_works_with_sti(InheritanceTest):
NoMethodError: undefined method `type=' for #<Cabbage id: 1, name: "my cucumber", custom_type: "Cucumber">
    /Users/username/Projects/rails/activemodel/lib/active_model/attribute_methods.rb:432:in `method_missing'
    /Users/username/Projects/rails/activerecord/lib/active_record/attribute_methods.rb:100:in `method_missing'
    /Users/username/Projects/rails/activerecord/lib/active_record/persistence.rb:165:in `becomes'
    test/cases/inheritance_test.rb:134:in `test_becomes_works_with_sti'
    test/cases/inheritance_test.rb:140:in `test_alt_becomes_works_with_sti'

Conflicts:

	activerecord/test/cases/inheritance_test.rb
01d09a6
@rafaelfranca rafaelfranca Merge pull request #7514 from senny/issue_7503_3_2_stable
set the configured #inheritance_column on #become (#7503)
87ac5b4
Commits on Sep 05, 2012
@rafaelfranca rafaelfranca Merge pull request #7337 from adzap/string_to_dummy_time
Fix for time type columns with invalid time value
Conflicts:
	activerecord/CHANGELOG.md
5054e26
Commits on Sep 07, 2012
@carlosantoniodasilva carlosantoniodasilva Update Active Model xml serialization test to reflect a change in bui…
…lder

Due to a change in builder, nil values and empty strings now generates
closed tags, so instead of this:

    <pseudonyms nil=\"true\"></pseudonyms>

It generates this:

    <pseudonyms nil=\"true\"/>

Document this change in Rails so that people can track it down easily if
necessary.

Conflicts:
	activemodel/CHANGELOG.md
d65adc7
@carlosantoniodasilva carlosantoniodasilva Fix AR tests due to builder change with nil values / empty strings
Check 0180e09 for more reasoning about
that.
77dd3be
@carlosantoniodasilva carlosantoniodasilva Fix AS tests due to builder change with nil values / empty strings
Check 0180e09 for more reasoning about
that.
146eaf3
Commits on Sep 09, 2012
@tchandy tchandy ConnectionAdapters::Column.type_cast_code should always convert value…
…s to integer calling #to_i
652107e
@rafaelfranca rafaelfranca Merge pull request #7582 from tchandy/fix_type_cast_code
type_cast_code should always convert values to integer calling #to_i
924ad60
Commits on Sep 11, 2012
@kennyj kennyj Backported #7572 to 3-2-stable. Use config['encoding'], because datab…
…ase configuration use not charset but encoding.
9630485
Commits on Sep 12, 2012
@rafaelfranca rafaelfranca Merge pull request #7603 from kennyj/fix_charset_vs_encoding_32
Backported #7572 to 3-2-stable. Use config['encoding'], because database configuration use not charset but encoding.
f568280
Commits on Sep 13, 2012
Steve Jorgensen Backport PostgreSQL auto-reconnect test coverage
6d5f4de
Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.

4b1bca0
Stop being silly with formatting of method aliasing.

c381d5c
Fix just-plain-wrongness of psql auto-reconnect test.

1e17a9d
Fix only-once stub logic.

f16c2043826ec1991cf94fe17cb671507b7a7f51
Changelog for PostgreSQL auto-reconnect test coverage backport.
f48bb01
@rafaelfranca rafaelfranca Merge pull request #7632 from stevecj/3-2-stable
3 2 stable
84c7896
Francesco Rodríguez fix markdown markup in AR/CHANGELOG 2326d46
@carlosantoniodasilva carlosantoniodasilva Merge pull request #7633 from frodsan/patch-5
Fix markdown markup in AR/CHANGELOG [ci skip]
5aaf79a
Commits on Sep 14, 2012
@rafaelfranca rafaelfranca `skip` in Ruby 1.8 doesn't skip the test case without return dbfdd00
Commits on Sep 17, 2012
@rafaelfranca rafaelfranca Backport explain fixes.
* Mark as SCHEMA some schema database queries. #7648
* Don't explain queries except normal CRUD sql. #7657

Closes #6458
Closes #7544
6abe0e7
@rafaelfranca rafaelfranca Merge pull request #7651 from steveklabnik/issue_3956
Don't preserve SELECT columns on COUNT

Closes #7651

Conflicts:
	activerecord/test/cases/associations/has_many_associations_test.rb
8432d03
@rafaelfranca rafaelfranca Merge pull request #7666 from kennyj/fix_9fa3f102813eeeec440abd75870d…
…fa7b23835665

Fix warning: method redefine. Testcase name are duplicated.
07c8055
@rafaelfranca rafaelfranca Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt
Fix collection= on hm:t join models when unsaved
ee43989
@senny senny log 404 status when ActiveRecord::RecordNotFound was raised (#7646)
Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_controller/log_subscriber.rb
dd76b3b
@jrochkind jrochkind backport fair connection pool 02b2335 to 3-2-stable 0693e07
@rafaelfranca rafaelfranca Merge pull request #7675 from jrochkind/fair_conn_pool_backport
backport fair connection pool 02b2335 to 3-2-stable
24a7774
@wagenet wagenet Respect `config.digest = false` for `asset_path`
Previously, the `asset_path` internals only respected the `:digest`
option, but ignored the global config setting. This meant that
`config.digest = false` could not be used in conjunction with
`config.compile = false` this corrects the behavior.
1ac19c1
Commits on Sep 18, 2012
@rafaelfranca rafaelfranca Merge pull request #7672 from wagenet/asset_path_digest_fix
Respect `config.digest = false` for `asset_path`
7c5454e
@steveklabnik steveklabnik Add upgrading note to 3.1 release notes.
See #7685.
1929d9f
@rafaelfranca rafaelfranca Merge pull request #7686 from steveklabnik/add_upgrade_note
Add upgrading note to 3.1 release notes.
29ebec7
Commits on Sep 19, 2012
@rafaelfranca rafaelfranca Cache columns metadata to avoid extra while testing a82f1e3
@rafaelfranca rafaelfranca Merge pull request #7668 from Draiken/fix_issue_6497
Removing to_shorthand to fix #6497
Conflicts:
	actionpack/CHANGELOG.md
61d5d2d
Commits on Sep 20, 2012
@jeremy jeremy Load the environment after creating the database
Conflicts:
	activerecord/lib/active_record/railties/databases.rake
c41f9c1
@kennyj kennyj Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and …
…%::z format strings.
4e715e3
@rafaelfranca rafaelfranca Merge pull request #7718 from kennyj/fix_6962-32
[3-2-stable] Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z format strings.
50a76c1
@rafaelfranca rafaelfranca Revert "backport fair connection pool 02b2335 to 3-2-stable"
This reverts commit 0693e07.

Revert "Cache columns metadata to avoid extra while testing"

This reverts commit a82f1e3.

Reason: This is causing failures in the postgresql build.
See http://travis-ci.org/#!/rails/rails/builds/2485584

Related with #7675
e4018a0
@rafaelfranca rafaelfranca Revert "Respect `config.digest = false` for `asset_path`"
This reverts commit 1ac19c1.

Conflicts:
	actionpack/CHANGELOG.md

Reason: This is causing failures in the railties build.
See http://travis-ci.org/#!/rails/rails/jobs/2491787

Related with #7672
54f5574
@rafaelfranca rafaelfranca Explictly set the assets digest option to false 9d07ace
@rafaelfranca rafaelfranca Revert "Revert "Respect `config.digest = false` for `asset_path`""
This reverts commit 54f5574.

Reason: the last commit fixed the failing case
98f8021
Commits on Sep 21, 2012
@tenderlove tenderlove Merge pull request #3544 from amatsuda/_field_changed
Rename field_changed? to _field_changed? so that users can create a field named field
Conflicts:

	activerecord/lib/active_record/core.rb
	activerecord/test/cases/dirty_test.rb
b8fba55
@rafaelfranca rafaelfranca Merge pull request #7723 from steveklabnik/backport_3554
Backport #3544 to 3-2-stable
7b545ff
@rafaelfranca rafaelfranca Fix invalid ruby 1.8 syntax 114e180
Commits on Sep 24, 2012
@jrochkind jrochkind ConnectionPool accepts spec key 'checkout_timeout'
Backport of #6441 cb6f839 . Old 'wait_timeout' is still supported,
but conflicts with mysql2 using that spec key for different thing.
'checkout_timeout' can now be used taking precedence for ConnectionPool
over 'wait_timeout'.
3908706
Commits on Sep 25, 2012
@rafaelfranca rafaelfranca Merge pull request #7684 from jrochkind/connection_pool_timeout_key_b…
…ackport

ConnectionPool accepts spec key 'checkout_timeout' (Backport)
8800aae
Commits on Sep 27, 2012
@jeremy jeremy Only apply log tags if the logger supports it 08ca483
@jeremy jeremy Log newlines separately to ensure the 'Started GET ...' line has a ta…
…g on the same line
032c2b6
@jeremy jeremy Add logger.push_tags and .pop_tags to complement logger.tagged
Avoid memory leak from unflushed logs on other threads leaving tags behind.

Conflicts:
	activesupport/CHANGELOG.md
	activesupport/lib/active_support/tagged_logging.rb
	activesupport/test/tagged_logging_test.rb
20f5f08
@jeremy jeremy Tune up Rails::Rack::Logger. Only put space between requests in devel…
…opment logs.

Conflicts:
	railties/test/application/rack/logger_test.rb
35a1750
Commits on Sep 28, 2012
@jeremy jeremy Shush syntax warnings ddba97f
@jeremy jeremy Shush uninitialized @_layout warning c203557
@jeremy jeremy Hashrocket for 1.8 support 8ca05c2
Evan Petrie backport 68677ff 8dbf337
@tenderlove tenderlove Merge pull request #7785 from okcwest/3-2-stable
backport 68677ff
e1a10b1
Commits on Sep 29, 2012
Tim Vandecasteele Don't paramify ActionDispatch::Http::UploadedFile in tests
To test uploading a file without using fixture_file_upload, a posted
ActionDispatch::Http::UploadedFile should not be paramified (just like
Rack::Test::UploadedFile).
(Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't
share the same API, tempfile is not accessible on
Rack::Test::UploadedFile as discussed in
brynary/rack-test#30)
c53e5de
@rafaelfranca rafaelfranca Merge pull request #7786 from yabawock/3-2-stable
Backport "Don't paramify ActionDispatch::Http::UploadedFile in tests"
c2a7084
Commits on Sep 30, 2012
@rafaelfranca rafaelfranca Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased
REBASED: fixing assert_template bug when template matches expected, but not ends with
Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_controller/test_case.rb
7d17cd2
@rafaelfranca rafaelfranca New CHANGELOG entries always in the top [ci skip] d77d4a8
@steveklabnik steveklabnik Fix reference to code sample in Getting Started.
Fixes #7799.
2475882
@fxn fxn Merge pull request #7802 from steveklabnik/issue_7799
Fix reference to code sample in Getting Started.
5cb5092
@jeremy jeremy Asset manifest includes aliases for foo.js -> foo/index.js and vice v…
…ersa. Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
19987b6
Commits on Oct 01, 2012
@rafaelfranca rafaelfranca Since File instance doesn't respond to #open use a double to test the
behavior added at c53e5de
628e38d
@rafaelfranca rafaelfranca Merge pull request #6450 from iHiD/resource_generator_routes_master
Master branch: Fixed generated whitespace in routes when using namespaced resource.

Merge pull request #7811 from iHiD/resource_generator_routes_master

Fix the build (Broken scaffold routes test)
a02f67b
@rafaelfranca rafaelfranca Merge pull request #7789 from senny/7777_resource_functions_modify_op…
…tions

resource and resources do no longer modify passed options
3b5bc8d
Commits on Oct 02, 2012
@rafaelfranca rafaelfranca Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va…
…riables

prefix TemplateAssertions ivars.

Closes #7459
Conflicts:
	actionpack/lib/action_controller/test_case.rb
	actionpack/lib/action_view/test_case.rb
2bad605
@rafaelfranca rafaelfranca Merge pull request #7822 from lulalala/reset-counter-cache-for-has-ma…
…ny-through

Fix reset_counters crashing on has_many :through associations.
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/counter_cache.rb
3f0bc97
Commits on Oct 03, 2012
@spastorino spastorino Refactor
Conflicts:
	activerecord/lib/active_record/counter_cache.rb
288885f
@lihanli lihanli Update supported ruby versions error message in ruby_version_check.rb 36261c8
@rafaelfranca rafaelfranca Merge pull request #7836 from lihanli/error-msg-update
Update supported ruby versions error message in ruby_version_check.rb
95369a5
Commits on Oct 04, 2012
@rafaelfranca rafaelfranca Merge pull request #6978 from frodsan/count_nosql_unsaved_parent
Count returns 0 without querying if parent is not saved
9896729
Commits on Oct 06, 2012
@rafaelfranca rafaelfranca Merge pull request #7850 from senny/5920_postgres_adapter_table_with_…
…capital_letters

postgres, quote table names when fetching the primary key (#5920)
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
de360ac
@rafaelfranca rafaelfranca Merge pull request #7848 from senny/3415_assert_template_has_nil_vari…
…able

can't pass :locals to #assert_template without a view test case (#3415)
Conflicts:
	actionpack/CHANGELOG.md
92d7612
@teleological teleological Accept :remote as symbol in link_to options
Accept either :remote or 'remote' in both the html_options and
(url_)options hash arguments to link_to.
380800e
@rafaelfranca rafaelfranca Use the Ruby 1.8 hash syntax f668ab9
Commits on Oct 07, 2012
@rafaelfranca rafaelfranca Merge pull request #7865 from teleological/link_to_remote_3_2
Accept :remote as symbol in link_to options (backport)
bf07c79
@jeremy jeremy Backport 1a70499
Tag the blank log line between dev requests so it's easier to filter out entire requests with grep -v without leaving a stray newline behind. Example:

  # Tag asset requests so it's easy to filter them from dev logs
  config.log_tags = [
    -> request { :assets if request.path.starts_with?(config.assets.prefix) },
    -> request { request.uuid }
  ]

  # Watch the logs, ignoring asset requests
  $ tail -100f log/development.log | grep -v assets
fb9c001
Commits on Oct 10, 2012
@michaelfairley michaelfairley Eager autoload ActiveRecord association helpers de1b687
@jfirebaugh jfirebaugh Eager autoload Preloader classes
Without eager autoloading, these would be autoloaded
only when #preloader_for is called, which is too late
in threaded applications.
2bed954
Commits on Oct 11, 2012
@rafaelfranca rafaelfranca Merge pull request #7905 from jfirebaugh/eager_autoload_3-2
Backport eager autoloading fixes
eefb344
Commits on Oct 12, 2012
@ernie ernie Fix has_many assocation w/select load after create
If you create a new record via a collection association proxy that has
not loaded its target, and which selects additional attributes through
the association, then when the proxy loads its target, it will
inadvertently trigger a deprecation notice during attribute writing when
CollectionAssociation#merge_target_lists attempts to do its thing, since
the newly loaded records will possess attributes the created record does
not.
990a938
@rafaelfranca rafaelfranca Merge pull request #7925 from ernie/3-2-fix-collection-associations-w…
…ith-select

Fix has_many assocation w/select load after create
84c3774
Commits on Oct 14, 2012
@arturopie arturopie #7914 get default value when type uses schema name
PostgreSQL adapter properly parses default values when using multiple
schemas and domains.

When using domains across schemas, PostgresSQL prefixes the type of the
default value with the name of the schema where that type (or domain) is.

For example, this query:
```
SELECT a.attname, d.adsrc
FROM pg_attribute a LEFT JOIN pg_attrdef d
ON a.attrelid = d.adrelid AND a.attnum = d.adnum
WHERE a.attrelid = "defaults"'::regclass
AND a.attnum > 0 AND NOT a.attisdropped
ORDER BY a.attnum;
```

could return something like "'<default_value>'::pg_catalog.text" or
"(''<default_value>'::pg_catalog.text)::text" for the text columns with
defaults.

I modified the regexp used to parse this value so that it ignores
anything between ':: and \b(?:character varying|bpchar|text), and it
allows to have optional parens like in the above second example.
3980465
@arturopie arturopie 7914 Using a better way to get the defaults from db.
Changes:

* According to postgreSQL documentation:
(http://www.postgresql.org/docs/8.2/static/catalog-pg-attrdef.html)
we should not be using 'adsrc' field because this field is unaware of
outside changes that could affect the way that default values are
represented. Thus, I changed the queries to use
"pg_get_expr(adbin, adrelid)" instead of the historical "adsrc" field.

* Remove parsing of character type default values for 8.1 formatting since
Rails doesn't support postgreSQL 8.1 anymore.

* Remove misleading comment unrelated to code.
3006c59
@rafaelfranca rafaelfranca Merge pull request #7940 from arturopie/7914-backport-to-3-2-stable
Backport fix of issue #7914 to 3-2-stable
b3485b7
Commits on Oct 15, 2012
@tenderlove tenderlove Synchronize around deleting from the reserved connections hash.
Fixes #7955
d92e66f
Commits on Oct 18, 2012
@spastorino spastorino Merge pull request #7371 from csmuc/fix_dup_validation_errors
Dup'ed ActiveRecord objects may not share the errors object
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/dup_test.rb
9a38e73
@Grandrath Grandrath Use `Rails.env` instead of `ENV['RAILS_ENV']`; #7951
`ENV['RAILS_ENV']` is not defined unless explicitly specified on the
command line when running `rake db:structure:load`. This patch lets
the rake task retrieve the environment from `Rails.env` which defaults
to "development".
f4ddc49
@senny senny active_model/validations requires necessary files to run 1f73a53
@rafaelfranca rafaelfranca Merge pull request #7989 from senny/backport_7969
backport: active_model/validations requires necessary files to run
6dfa701
@rafaelfranca rafaelfranca Require ActionController::Railtie in the default middleware stack.
This will make possible to do a frameworkless initialization since the
the default middleware stack is self contained.
b04ec27
Commits on Oct 20, 2012
@carlosantoniodasilva carlosantoniodasilva Merge pull request #7986 from Grandrath/patch-2
Fix behavior of `rake db:structure:load` for 3.2.8
2471271
Commits on Oct 22, 2012
@tenderlove tenderlove frozen state should be restored after txn is aborted f7c2a81
Commits on Oct 24, 2012
@GRoguelon GRoguelon Adding a missing parenthesis in the doc of String#parameterize. 9f1a47d
@rafaelfranca rafaelfranca Merge pull request #8022 from GRoguelon/3-2-stable
Adding a missing parenthesis in the doc of String#parameterize.
7f09bcd
Commits on Oct 27, 2012
@rafaelfranca rafaelfranca Add test case to assets eager load 552a3e1
@jeremy jeremy Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency
Fix AM::Serializers::Xml dependency
4b1a7bc
@elia elia Respect children paths filter settings
E.g. don't eager-load app/assets even if app/* has the eager_load flag set.
53778ec
Commits on Oct 28, 2012
@arunagw arunagw Removing JSON for other ruby
It's only required for 1.8 and for JRuby!
I was fixing a bug with JSON pure on 1.8.7
and I found that we have included json for other
1.8 > rubies also.
1adb784
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8047 from arunagw/json_only_in_18
Removing JSON for other ruby
2b5d3aa
@rafaelfranca rafaelfranca Merge pull request #8048 from senny/7761_dont_render_view_without_mai…
…l_call

Do not render views when mail() isn't called. (NullMail refactoring)
Conflicts:
	actionmailer/CHANGELOG.md
37586dd
Commits on Oct 29, 2012
@rafaelfranca rafaelfranca Merge pull request #7593 from veader/patch-1
Decode attributes pulled from URI.parse
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/connection_adapters/connection_specification.rb
a119dd3
@rafaelfranca rafaelfranca Fix the skip code.
Checking for the constant doesn't work
721cf54
@rafaelfranca rafaelfranca Make Active Record tests pass in isolation
Also remove the feature detecting for Ruby 1.9
5d82c1f
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8053 from henrik/update_columns_with_primary_key
Unbreak update_column/update_columns for the primary key attribute.
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/persistence.rb
	activerecord/test/cases/persistence_test.rb
cdfa4a5
@rafaelfranca rafaelfranca Merge pull request #8057 from frodsan/fix_sqlite_mutate_arg
SQLite3Adapter#type_cast should not mutate arguments
Conflicts:
	activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
d40309a
@elia elia Deprecate Paths::Path#children which is unused now f7de647
@rafaelfranca rafaelfranca Merge pull request #7587 from elia/fix-too-eager-loading
Should not eager_load app/assets
a53e464
@rafaelfranca rafaelfranca Revert "Deprecate Paths::Path#children which is unused now"
This reverts commit f7de647.

We can't deprecate things in stable branches. I didn't not realized that
the pull request was for 3-2-stable
633f2cd
@spastorino spastorino Add 3.2.9 section in ARes CHANGELOG
[ci skip]
6ed23ea
@spastorino spastorino Bump to 3.2.9.rc1 fdfb399
@graceliu graceliu fixed support for DATABASE_URL for rake db tasks
Backport for #7521

- added tests to confirm establish_connection uses DATABASE_URL and
  Rails.env correctly even when no arguments are passed in.
- updated rake db tasks to support DATABASE_URL, and added tests to
  confirm correct behavior for these rake tasks.  (Removed
  establish_connection call from some tasks since in those cases
  the :environment task already made sure the function would be called)
- updated Resolver so that when it resolves the database url, it
  removes hash values with empty strings from the config spec (e.g.
  to support connection to postgresql when no username is specified).
- updated ResolverTest to use current_adapter? to check the type of
  the current adapter.
e7a6b92
@rafaelfranca rafaelfranca Merge pull request #8009 from graceliu/3-2-fix_database_url_support
fixed support for DATABASE_URL for rake db tasks
e6b4184
Commits on Oct 30, 2012
@rafaelfranca rafaelfranca Fix bug when Column is trying to type cast boolean values to integer.
This can occur if the user is using :integer columns to store boolean
values. Now we are handling the boolean values but it still raises if
the value can't type cast to integer and is not a boolean. See #7509.

Fixes #8067.
96a13fc
@rafaelfranca rafaelfranca Fix typo :bomb: [ci skip] fad74d6
@rafaelfranca rafaelfranca Add CHANGELOG entry to #8032 fix
e6b4184 fixes that issue too.

[ci skip]
37c60c9
Commits on Oct 31, 2012
@rafaelfranca rafaelfranca Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_asse…
…rtion_variables"

This reverts commit 2bad605.

Conflicts:
	actionpack/CHANGELOG.md

Reason: This added a regression related with shoulda-matchers, since it
is expecting the instance variable @layouts

See https://github.com/thoughtbot/shoulda-matchers/blob/9e1188eea68c47d9a56ce6280e45027da6187ab1/lib/shoulda/matchers/action_controller/render_with_layout_matcher.rb#L74

This will introduce back #7459 but this stable release will be backward compatible.
Related with #8068.
6b7cd20
@rafaelfranca rafaelfranca Revert "Merge pull request #7659 from HugoLnx/template_error_no_match…
…es_rebased"

This reverts commit 7d17cd2.

Conflicts:
	actionpack/CHANGELOG.md

Reason: This added a regression since people were relying on this buggy behavior.
This will introduce back #3849 but we will be backward compatible in
stable release.

Fixes #8068.
d5b275d
@saks saks Fix ActiveRecord#update_column return value 68307a1
@josevalim josevalim Merge pull request #8083 from saks/fix_update_column_return_value
Fix ActiveRecord#update_column return value
f5f57e2
@fxn fxn relaxes assertion
This method returns the status of the operation,
but as we generally do in the code base it does
not commit to any particular exact value. Hence,
we do not have to check for a singleton, because
if the implementation changes and returns some
other true value the test should pass.
f32f150
Commits on Nov 01, 2012
@carlosantoniodasilva carlosantoniodasilva Fix issue with collection associations and first(n)/last(n)
When calling first(n) or last(n) in a collection, Active Record was
improperly trying to set the inverse of instance in case that option
existed. This change was introduced by
fdf4eae.

In such cases we don't need to do that "manually", since the way
collection will be loaded will already handle that, so we just skip
setting the inverse association when any argument is given to
first(n)/last(n).

The test included ensures that these scenarios will have the inverse of
instance set properly.

Fixes #8087, Closes #8094.
d37d40b
@carlosantoniodasilva carlosantoniodasilva Ensure calling first/last with options correctly set inverse association
Also related to #8087. Thanks @al2o3cr.
c368b66
@spastorino spastorino Bump to 3.2.9.rc2 de3dff3
Commits on Nov 02, 2012
@rafaelfranca rafaelfranca Revert "Merge pull request #7668 from Draiken/fix_issue_6497"
This reverts commit 61d5d2d.

Conflicts:
	actionpack/CHANGELOG.md

REASON: This added a backward incompatible change.
4a86362
@rafaelfranca rafaelfranca Add test to avoid regression of 4a86362 190dddf
@spastorino spastorino Clear url helpers when reloading routes e41d78c
Commits on Nov 09, 2012
@spastorino spastorino Revert "Respect children paths filter settings"
This reverts commit 53778ec.
Closes #8146
fc5ccd2
@rafaelfranca rafaelfranca Merge pull request #8161 from guilleiguaran/downgrade-sprockets
Lock sprockets to 2.2.x

REASON: We had some pending fixes in sprockets and sass-rails to make possible to use sprockets version > 2.2. We will do a more conservative sprockets upgrade for this release.

In a next release we can relax the dependency again.

See #8099 for more information.
1baae1d
@spastorino spastorino Bump up to 3.2.9.rc3 db1d5f4
@spastorino spastorino Revert "Add test case to assets eager load"
This reverts commit 552a3e1.
9a389cc
Commits on Nov 12, 2012
@spastorino spastorino Bump to 3.2.9 b33cf74
Commits on Dec 23, 2012
@claudiob claudiob Add release date of Rails 3.2.9 to documentation
Conflicts:
	actionpack/CHANGELOG.md
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
acc2aa4
@tenderlove tenderlove updating the changelog for the CVE 784a386
@tenderlove tenderlove updating the changelogs 6727ac6
@tenderlove tenderlove updating changelog 7d592ba
@tenderlove tenderlove CVE-2012-5664 options hashes should only be extracted if there are ex…
…tra parameters
325669f
@tenderlove tenderlove bumping version to 3.2.10 8ba3df0
Commits on Jan 08, 2013
@spastorino spastorino Avoid Rack security warning no secret provided
This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie."
95fe9ef
@tenderlove tenderlove * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] …
…* dealing with empty hashes. Thanks Damien Mathieu
d5cd97b
@jeremy jeremy CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. 43109ec
@tenderlove tenderlove bumping version 746dbd8