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 Apr 10, 2012
@jeremy jeremy Merge pull request #5800 from arunagw/bigdecimal_dup
Backport BigDecimal#duplicable? feature check from master
e0fd4fc
Commits on Apr 12, 2012
@tenderlove tenderlove test against ruby features in order to fix tests on Ruby 2.0 96d81e5
@jeremy jeremy Merge pull request #5820 from arunagw/more_ruby-2-0-fixes
Update test for Ruby 2 compatibility
e473e1f
@sikachu sikachu Fix code example in generator test case c0e6a85
@vijaydev vijaydev fix typo in readme [ci skip] efa9a1f
Commits on Apr 13, 2012
@alekseykulikov alekseykulikov "rails new -h" shows message in rails directory 2f9fdbf
Commits on Apr 15, 2012
@drogus drogus Add missing require in Active Support time zones (fixes #5854)
I also removed the other require as it's already present in
`activesupport/core_ext/time/calculations`
a748eca
Commits on Apr 16, 2012
@arunagw arunagw multi_json is restricted to < 1.3
Some API changes are there above 1.3. 
3-2-stable
9b14e3f
@jeremy jeremy Merge pull request #5861 from arunagw/multi_json_fix_3-2-stable
Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3
9a97699
@tiegz tiegz catch nil.to_sym errors in partial_renderer, and raise ArgumentError …
…instead
dcc11b2
@tiegz tiegz converting some tests to assert_raises, and DRY'ing retrieve_variable…
… changes

Conflicts:

	actionpack/test/template/render_test.rb
6b8dd70
Commits on Apr 17, 2012
@asanghi asanghi Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a…
… more maintained debugger gem
56674db
@jeremy jeremy Merge pull request #5874 from asanghi/3-2-stable
replace ruby-debug19 with debugger on Rails 3-2 stable
89f99e8
Commits on Apr 18, 2012
@norman norman Check for nil logger d92166c
@tenderlove tenderlove Merge pull request #5894 from norman/3-2-fix-nil-logger
Fix nil logger on 3.2
476fa7a
@spastorino spastorino Add hook for add_resource_route 3986139
Commits on Apr 19, 2012
@jeremy jeremy Revert "Fix #5667. Preloading should ignore scoping."
Causes a subtle regression where record.reload includes the default
scope. Hard to reproduce in isolation. Seems like the relation is
getting infected by some previous usage.

This reverts commit dffbb52.
1166d49
@sferik sferik Revert "multi_json is restricted to < 1.3 "
This reverts commit 9b14e3f.
e01bf0a
@sferik sferik Use `Object#respond_to?` to determine which MultiJson API to use 5e62670
@benedikt benedikt Removes caching from ActiveRecord::Core::ClassMethods#relation
The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place.

The four places with calls to relations are:

activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'"
activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'"
activerecord/lib/active_record/scoping/named.rb:38:in `scoped'"
activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'"

Conflicts:

	activerecord/lib/active_record/core.rb
13f1401
@benedikt benedikt Adds test to check that circular preloading does not modify Model.uns…
…coped (as described in #5667)

Conflicts:

	activerecord/test/cases/associations/eager_test.rb
8491740
@benedikt benedikt Revert "Revert "Fix #5667. Preloading should ignore scoping.""
This reverts commit 1166d49.

Conflicts:

	activerecord/test/cases/associations/eager_test.rb
2c21a2f
@benedikt benedikt Removes unneeded caching from ActiveRecord::Base.relation ebfa58a
@jeremy jeremy Merge pull request #5898 from benedikt/3-2-stable
Readds the fix for #5667 and back ports the regression fix from #5718
b9e5c5a
@amatsuda amatsuda Be sure to correctly fetch PK name from MySQL even if the PK has some…
… custom option

Backports #5900

Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
f51557d
Commits on Apr 21, 2012
@joevandyk joevandyk Only include Rake::DSL if it's defined.
rake < 0.9 doesn't define Rake::DSL.
07b1fe5
@jeremy jeremy Merge pull request #5896 from sferik/revert_5861
Revert #5861. Feature-detect which MultiJson API to use.
c3d50b3
Commits on Apr 23, 2012
@arunagw arunagw ARes URL should be pointed to 3-2-stable tree not master. 210713e
@vijaydev vijaydev Merge pull request #5935 from arunagw/readme_fixes_3-2-stable
As ARes is removed from master then 3-2-stable URL should be in README.
0ed6e13
@arunagw arunagw Updated other README to point 3-2-stable 21b1a79
@vijaydev vijaydev Merge pull request #5936 from arunagw/other_readme_fixes
Updated other README to point 3-2-stable
979e9d0
@jeremy jeremy Merge pull request #5919 from joevandyk/rake-dsl-fix
Only include Rake::DSL if it's defined (Rake >= 0.9)
dd01c11
@tenderlove tenderlove Merge pull request #5866 from tiegz/minor_fixes_3-2-stable
Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
0f5af60
@sikachu sikachu Fix broken test from the earlier merge conflict
Seriously people, please run the test before submitting pull request.
0f3fd78
@spastorino spastorino Merge pull request #5946 from sikachu/3-2-stable-fix-merge-conflict
Fix broken test from the earlier merge conflict
db6787a
Commits on Apr 24, 2012
@kennyj kennyj Fix build. It seems that the Mocha's behavior were changed. d95f3d3
@jeremy jeremy Merge pull request #5968 from sikachu/3-2-stable-backport
Backport workarounds for Mocha behavior changes.
9212083
@carlosantoniodasilva carlosantoniodasilva Add extra order clause to fix failing test on Ruby 1.8.7 20f398d
Commits on Apr 25, 2012
@jeremy jeremy Merge pull request #5971 from carlosantoniodasilva/fix-build-3-2
Add extra order clause to fix failing test on Ruby 1.8.7
7d95b81
Commits on Apr 26, 2012
@vijaydev vijaydev fix number_to_human docs [ci skip] 006de25
Commits on Apr 27, 2012
@tenderlove tenderlove Merge pull request #4528 from j-manu/log-tailer-fix
Fix for log tailer when the log file doesn't exist.
05bee99
@carlosantoniodasilva carlosantoniodasilva Do not mutate options hash 7006e97
@tenderlove tenderlove Merge pull request #6022 from sikachu/3-2-stable-record_tag_backport
Do not mutate options hash
434be0f
Commits on Apr 28, 2012
@oscardelben oscardelben Remove circular require of time/zones 61d84e0
@drogus drogus Merge pull request #6038 from arunagw/warning_removed_3-2-stable
Warning removed 3 2 stable
86559be
tomhuda Allow Thor 0.15 and 1.0, to be released shortly 7dc83f7
Commits on Apr 29, 2012
@drogus drogus Lazy load `default_form_builder` if it's passed as a string
closes #3341
beba826
@pixeltrix pixeltrix Don't convert params if the request isn't HTML - fixes #5341
(cherry picked from commit 7a80b69)

Conflicts:

	actionpack/test/controller/test_test.rb
d6bbd33
@rafaelfranca rafaelfranca Fix the build.
* The method for persisted records in 3-2-branch is 'PUT'
* size is generated by default in inputs
a782aa5
@rafaelfranca rafaelfranca Remove warning of unused variable b18603b
@josevalim josevalim Merge pull request #6051 from rafaelfranca/fix_build
Fix the build
0df261a
@pixeltrix pixeltrix Escape interpolated params when redirecting - fixes #5688 b608cdd
@pixeltrix pixeltrix Add missing require from b608cdd 4075a39
@pixeltrix pixeltrix Restore interpolation of path option in redirect routes 6cad407
Commits on Apr 30, 2012
@rafaelfranca rafaelfranca Add missing require when helpers are used in isolation 6b8a3a0
@rafaelfranca rafaelfranca Deprecate link_to_function and button_to_function helpers 9dc57fe
@rafaelfranca rafaelfranca Add CHANGELOG entry.
Closes #5886
Closes #3093
342b54a
@rafaelfranca rafaelfranca Add release data to Rails 3.2.3 3005f58
@jeremy jeremy Merge pull request #5922 from rafaelfranca/deprecate_javascript_helpers
Deprecate link_to_function and button_to_function
8fec5d7
@pixeltrix pixeltrix Add note about using 303 See Other for XHR requests other than GET/POST
IE since version 6 and recently Chrome and Firefox have started following
302 redirects from XHR requests other than GET/POST using the original request
method. This can lead to DELETE requests being redirected amongst other things.

Although it doesn't directly affect the Rails framework since it doesn't return
a 302 redirect to any non-GET/POST request a note has been added to raise
awareness of the issue. Some references:

Original article from @technoweenie:
http://techno-weenie.net/2011/8/19/ie9-deletes-stuff/

Hacker News discussion of the article:
http://news.ycombinator.com/item?id=2903493

WebKit bug report:
https://bugs.webkit.org/show_bug.cgi?id=46183

Firefox bug report and changeset:
https://bugzilla.mozilla.org/show_bug.cgi?id=598304
https://hg.mozilla.org/mozilla-central/rev/9525d7e2d20d

Chrome bug report:
http://code.google.com/p/chromium/issues/detail?id=56373

HTTPbis bug report and changeset:
http://trac.tools.ietf.org/wg/httpbis/trac/ticket/160
http://trac.tools.ietf.org/wg/httpbis/trac/changeset/1428

Roy T. Fielding's history of the issue:
http://ftp.ics.uci.edu/pub/ietf/http/hypermail/1997q3/0611.html

Automated browser tests for the issue:
http://www.mnot.net/javascript/xmlhttprequest/

Fixes #4144
(cherry picked from commit 24f1437)
a72fe84
@willbryant willbryant fix the Flash middleware loading the session on every request (very d…
…angerous especially with Rack::Cache), it should only be loaded when the flash method is called
e3069c6
@drogus drogus Failing test for #6034 2b2983d
@IamNaN IamNaN Correcting some confusion. Pago Pago is part of American Samoa, not S…
…amoa.

Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011
switching from UTC-11 to UTC+13. American Samoa did not make the change and
remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and
documentation about the dateline change is in austalasia at IANA.

(cherry picked from commit 1d08ce5)
5fe88b1
@route route Fix #3993 assets:precompile task does not detect index files df84577
Commits on May 01, 2012
@route route Added test for assets:precompile for index files 580e767
Commits on May 02, 2012
@drogus drogus Deprecate remove_column with array as an argument 02ca915
@jeremy jeremy Merge pull request #6095 from route/assets_precompile_task
Fix that asset precompile didn't respect the index.js convention. Fixes #3993.
ebe994f
@frodsan frodsan Fix #4979 against 3-2-stable - delete_all raise an error if a limit i…
…s provided
4657dba
@pixeltrix pixeltrix Reset the request parameters after a constraints check
A callable object passed as a constraint for a route may access the request
parameters as part of its check. This causes the combined parameters hash
to be cached in the environment hash. If the constraint fails then any subsequent
access of the request parameters will be against that stale hash.

To fix this we delete the cache after every call to `matches?`. This may have a
negative performance impact if the contraint wraps a large number of routes as the
parameters hash is built by merging GET, POST and path parameters.

Fixes #2510.
(cherry picked from commit 5603050)
7c7fb3a
Commits on May 03, 2012
@jmbejar jmbejar Make sure that javascript_include_tag/stylesheet_link_tag methods in
sprockets/helpers/rails_helper.rb discard duplicated assets
0621ecb
Commits on May 04, 2012
@nragaz nragaz Add a role option to wrap_parameters.
The role option identifies which parameters are accessible and should be wrapped. The default role is :default.
bfb25f9
@kucaahbe kucaahbe improvements in "caching_with_rails" guide - backported from docrails
Conflicts:

	railties/guides/source/caching_with_rails.textile
b4ae94f
@vijaydev vijaydev Merge pull request #6158 from Dagnan/3-2-stable
improvements in "caching_with_rails" guide
5384bdb
@mjtko mjtko added beginning_of_hour support to core_ext calculations for Time and…
… DateTime
145cc69
@josevalim josevalim Merge pull request #4445 from nragaz/role_based_params_wrapping
specify a role for identifying accessible attributes when wrapping params
efb054b
Commits on May 05, 2012
@tenderlove tenderlove Merge pull request #6128 from frodsan/delete_all_limit_32
Fix #4979 against 3-2-stable
80a292c
@drogus drogus Give more detailed instructions in script/rails in engine
closes #4894
915879c
@jeremy jeremy Merge pull request #6170 from mjtko/feature-beginning_of_hour-for-3-2…
…-stable

Backport beginning and end of hour support for Time and DateTime to 3-2-stable
7fb268d
Commits on May 07, 2012
@whistlerbrk whistlerbrk Add failing test re #3436 which demonstrates content_type is not resp…
…ected when using the :head method/shortcut
6f38348
@whistlerbrk whistlerbrk If content_type is explicitly passed to the :head method use the valu…
…e or fallback
4d52738
Commits on May 08, 2012
@josevalim josevalim Merge pull request #6198 from whistlerbrk/3-2-stable
Address ActionPack head method not respecting explicitly set content-type #3436
b86e0be
@arunagw arunagw locking ruby-prof until we got a fix 764e2de
@spastorino spastorino Merge pull request #6200 from arunagw/3-2-stable
locking ruby-prof for now.
b12d03d
@frodsan frodsan added docs to attribute_accessors methods 96fe0af
@vijaydev vijaydev Merge pull request #6211 from frodsan/docs_attr_accessor_32stable
Adding docs to attribute accessor methods.
ad4d408
@frodsan frodsan removing docs duplication 16a9a87
@vijaydev vijaydev Merge pull request #6213 from frodsan/cut_docs_dup
Removing attribute_accessor docs duplication
5059c32
Commits on May 09, 2012
@frodsan frodsan Fix build ba48e23
@frodsan frodsan fix attribute_accessors docs to support 1.8 syntax dd7e7b3
@vijaydev vijaydev Merge pull request #6218 from frodsan/fix_docs_32stable
Fix docs to support 1.8 syntax
cb242a9
@carlosantoniodasilva carlosantoniodasilva Stop showing deprecations for Ruby 1.8.7 with remove_column
String is Enumerable in 1.8.7, which means that passing a String to
remove_column was generating deprecation warnings during tests.
fa34ace
@pixeltrix pixeltrix Merge pull request #6223 from carlosantoniodasilva/remove-columns-dep…
…recation-ruby187

Stop showing deprecations for Ruby 1.8.7 with remove_column
381f6e7
@mjtko mjtko Bring activesupport CHANGELOG up-to-date/consistent with master. 705a70f
@mjtko mjtko Add CHANGELOG section for unreleased Rails 3.2.4; document addition o…
…f #beginning_of_hour and #end_of_hour to Time and DateTime core extensions.
9b777d5
@vijaydev vijaydev Merge pull request #6228 from mjtko/changelog-fixes-for-3-2-stable
Updated activesupport CHANGELOG [for 3-2-stable]
b003ddf
@drogus drogus Merge pull request #6219 from frodsan/fix_build
Fix build - 3.2
8f5079f
@spastorino spastorino Merge pull request #6149 from jmbejar/javascript_include_tag_with_not…
…_duplicates

Make sure that javascript_include_tag/stylesheet_link_tag methods don't consider duplicated assets
f8dae86
@alexeymuranov alexeymuranov Deprecate ::instantiate_fixtures unused parameter
Deprecate the use of AcitiveRecord::Fixtures::instantiate_fixtures(object, fixture_set_name, fixture_set, load_instances = true), use instead instantiate_fixtures(object, fixture_set, load_instances = true).

To be changed in master branch.
f02e7dc
@alexeymuranov alexeymuranov Remove deprecated use of ::instantiate_fixtures 9810555
Commits on May 10, 2012
@jeremy jeremy Merge pull request #6221 from alexeymuranov/deprecate__instantiate_fi…
…xtures__arity

Deprecate ActiveRecord::Fixtures.instantiate_fixtures unused parameter
22a6072
@spectator spectator Make sure TimeoutError is loaded. c2193c1
@jeremy jeremy Merge pull request #6230 from spectator/active_resource_exceptions
ActiveResource::TimeoutError is not loaded
a9fc8a9
@pixeltrix pixeltrix Refactor the handling of default_url_options in integration tests
This commit improves the handling of default_url_options in integration
tests by making behave closer to how a real application operates.

Specifically the following issues have been addressed:

* Options specified in routes.rb are used (fixes #546)
* Options specified in controllers are used
* Request parameters are recalled correctly
* Tests can override default_url_options directly
f3aaac4
@pixeltrix pixeltrix Don't ignore nil positional arguments for url helpers - fixes #6196. 66e338a
@pixeltrix pixeltrix Return false for exists? with new records - fixes #6199.
(cherry picked from commit fa21b73)
62f098d
Commits on May 11, 2012
@arunagw arunagw Update performance profiler to work with latest ruby-prof 9d616ea
@arunagw arunagw Ruby-Prof works with ruby-1.9.3 also. 4b59961
@alexeymuranov alexeymuranov Remove unused private method yaml_fixtures_key 5ecd14c
@spastorino spastorino Merge pull request #6262 from arunagw/ruby_prof_fix
Ruby prof fix
9cead4a
Commits on May 12, 2012
Erich Menge Update 'getting started' guides for new whitelist security implementa…
…tion. Closes #6286.
ccf80c2
@rafaelfranca rafaelfranca Merge pull request #6292 from erichmenge/3-2-stable-docfix
3 2 stable guides fix
41e7a2a
Commits on May 13, 2012
@frodsan frodsan adding examples and docs 2f4696d
@vijaydev vijaydev Merge pull request #6294 from frodsan/docs_backport
Adding examples and docs [3-2-stable]
3d0e7ad
@guilleiguaran guilleiguaran Upgrade sprockets to 2.1.3 62b74b1
@Mik-die Mik-die :foreign_key option should be on has_many side of association 3f7ed52
@spastorino spastorino Merge pull request #6299 from guilleiguaran/upgrade-sprockets-3-2-stable
Upgrade sprockets to 2.1.3
8a5b51e
@carlosantoniodasilva carlosantoniodasilva Merge pull request #6306 from erichmenge/3-2-stable-guide-fix
3 2 stable guide fix [ci skip]
e7d5ba3
@rafaelfranca rafaelfranca Merge pull request #3237 from sakuro/data-url-scheme
Support data: url scheme
9ff97b0
@rafaelfranca rafaelfranca Deprecate `:mouseover` options for `image_tag` helper. 1aff772
Commits on May 14, 2012
@carlosantoniodasilva carlosantoniodasilva Merge pull request #6266 from alexeymuranov/remove_unused_private_method
Remove unused private method
9199ddf
@homakov homakov Update railties/lib/rails/generators/rails/app/templates/config/appli…
…cation.rb

Signed-off-by: José Valim <jose.valim@gmail.com>
4588684
@josevalim josevalim Default escape_html_entities_in_json to true in new apps ec68258
@carlosantoniodasilva carlosantoniodasilva Merge pull request #6018 from lest/patch-1
mailer can be anonymous
2506d4a
Carlos Galdino + Rafael Mendonça França Deprecate `:disable_with` in favor of `'data-disable-with'` option fo…
…r `button_to` and `submit_tag` helpers.
21141e7
Carlos Galdino + Rafael Mendonça França Fix typo d47d6e7
Carlos Galdino + Rafael Mendonça França Deprecate `:disable_with` for `button_tag` too e9051e2
Commits on May 15, 2012
@frodsan frodsan Backporting some docs on core_ext/hash b2f73c4
@vijaydev vijaydev Merge pull request #6321 from frodsan/backport_docs
Backporting docs
007539d
@acapilleri acapilleri clean the errors if an object that includes validations errors is dup…
…ed,for 3-2-stable

It Fixes #5953 in 3-2-stable, it's the same pull request of #6284
396e383
@rafaelfranca rafaelfranca Merge pull request #6324 from acapilleri/dup_validation_3_2
Dup validation 3 2
9a868a0
@carlosantoniodasilva carlosantoniodasilva Fix indent from previous merge 2dfa8b5
Angelo Capilleri add backport for the pull request #6324 e885b18
@rafaelfranca rafaelfranca Merge pull request #6329 from acapilleri/backport_dup_validation_3_2
Backport dup validation 3 2
8470fdb
Commits on May 16, 2012
@bcardarella bcardarella Changing the indentation level of the block comment close for SASS
If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
9f4c4f6
@tenderlove tenderlove Merge pull request #6340 from bcardarella/patch-3
Changing the indentation level of the block comment close for Sass
e3033e3
Commits on May 17, 2012
@drogus drogus Fix CollectionAssociation#replace to return new target (closes #6231)
Conflicts:

	activerecord/test/cases/associations/has_many_associations_test.rb
0f43592
@frodsan frodsan fix validations docs 4bbd05c
@vijaydev vijaydev Merge pull request #6367 from frodsan/fix_validators_docs
Fix validators docs [3-2-stable]
75e8e77
Commits on May 18, 2012
@iHiD iHiD Deprecate old APIs for highlight, excerpt and word_wrap 616c91d
@rafaelfranca rafaelfranca Merge pull request #6377 from ihid/depreciate_old_text_helper_apis
Deprecate old APIs for highlight, excerpt and word_wrap
2802ad0
@jonleighton jonleighton Perf: Don't load the association for #delete_all.
Bug #6289

Conflicts:

	activerecord/test/cases/associations/has_many_associations_test.rb
b98d1e2
@jonleighton jonleighton fix #delete_all with habtm with :delete_sql 855fabc
@ernie ernie Fix HABTM syntax error in Ruby 1.8.x 3b444ee
@rafaelfranca rafaelfranca Merge pull request #6390 from ernie/invalid-ruby18-syntax-in-habtm
Invalid ruby18 syntax in habtm
8ad8f61
@josevalim josevalim Merge pull request #5020 from KL-7/fix-blank-image_tag-source
Render img tag with empty src if empty string is passed to image_tag.
4dd4621
Commits on May 19, 2012
@drogus drogus Ensure that CollectionAssociation#replace returns proper target
The fix commited in e2a070c was returning the `new_target`, as
a try to return whatever user replaced association with. The
problem is, the resulting association target may be ordered
differently. In such case we want to return the target that
will be later used for that association.
d641646
@tenderlove tenderlove Merge pull request #6398 from pmahoney/threadsafe-connection-pool
Synchronize read and modification of @reserved_connections
879611f
@carlosantoniodasilva carlosantoniodasilva Use right option for excerpt text helper in tests, fix build
`excerpt` text helper uses `:radius`, not `line_width` (that is used by
`word_wrap` helper).

Also cleanup some whitespaces.
c520504
Commits on May 20, 2012
@drogus drogus Fix `validates_uniqueness_off :field, :allow_nil => false`
Closes (#5853)

Uniqueness validator was not properly checking if there are any existing
records, when value was `nil` and column was text type. `nil` was
converted to string, which resulted in queries looking like:

```sql
SELECT 1 FROM "posts" WHERE "posts"."title" = '' LIMIT 1
```

instead of

```sql
SELECT 1 FROM "posts" WHERE "posts"."title" IS NULL LIMIT 1
```
f7d01ec
@drogus drogus Fix uniqueness validator with `allow_nil: false` also for mysql
MySQL's adapter was changing value for case sensitive comparison. We
don't need to do it for `nil`.
0d73d6e
@drogus drogus Improve docs for `try` by adding note on `BasicObject`
[ci skip] closes #5790
6ef9fda
@pinetops pinetops Prevent concurrent compilation of templates - closes #6400 565c1b0
@Bodacious Bodacious Fixed tag_helper data-attribute bug with BigDecimals 39b9c94
@josevalim josevalim Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806…
…f7b028614c

Template concurrency fixes
fe9731e
@rafaelfranca rafaelfranca Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stable
TagHelper creates invalid data attributes when value is a BigDecimal
68a454c
Commits on May 21, 2012
@drogus drogus Fix generators to help with ambiguous `ApplicationController` issue
In development mode, dependencies are loaded dynamically at runtime,
using `const_missing`. Because of that, when one of the constants is
already loaded and `const_missing` is not triggered, user can end up
with unexpected results.

Given such file in an Engine:

```ruby
module Blog
  class PostsController < ApplicationController
  end
end
```

If you load it first, before loading any application files, it will
correctly load `Blog::ApplicationController`, because second line will
hit `const_missing`. However if you load `ApplicationController` first,
the constant will be loaded already, `const_missing` hook will not be
fired and in result `PostsController` will inherit from
`ApplicationController` instead of `Blog::ApplicationController`.

Since it can't be fixed in `AS::Dependencies`, the easiest fix is to
just explicitly load application controller.

closes #6413
b0f8355
@drogus drogus More info on commit messages in contributing guide
Add more info on how to write a good commit messages along with
example showing nicely formatted commit message.

Rails git history does not look too well when you try to figure out why
particular changes were introduced. We can do much better than that and
it's never too late to start.
64e12ff
@pwnall pwnall Postgresql doesn't accept limits on binary (bytea) columns. 36fdb72
@lest lest Assets: don't add extension if other given and file exists
We should lookup if asset without appended extension exists.
When sprockets are disabled the asset tag helpers incorporate
this logic. When sprockets are enabled we should have the same
logic.

For example, we have style.ext file in app/assets/stylesheets and
we use stylesheet_link_tag in the layout. In this case we should
have /assets/style.ext instead of /assets/style.ext.css in the
output.

Closes #6310
39f9f02
@carlosantoniodasilva carlosantoniodasilva Merge pull request #6423 from lest/patch-2
assets: don't add extension if other given and file exists
f051071
@tenderlove tenderlove Merge pull request #6418 from pwnall/pgsql_bytea_limit3
Postgresql doesn't accept limits on binary (bytea) columns (for 3-2-stable)
5d6cca1
Commits on May 22, 2012
@drogus drogus Use require_dependency in generated controllers
Using require in development mode will prevent required files from
reloading, even if they're changed. In order to keep namespaced
application_controller reloadable, we need to use require_dependency
instead of require.
56b86a3
@chancancode chancancode Restore the frozen state on rollback. Fixes #6417.
This is a 3-2-stable backport for #6420 which was merged into master.

Currently, when saving a frozen record, an exception would be thrown
which causes a rollback. However, there is a bug in active record that
"defrost" the record as a side effect:

    >> t = Topic.new
    => #<Topic id: nil, ...>
    >> t.freeze
    => #<Topic id: nil, ...>
    >> t.save
    RuntimeError: can't modify a frozen Hash
    >> t.frozen?
    => false
    >> t.save
    => true

This patch fixes the bug by explictly restoring the frozen state on the
attributes Hash after every rollback.
a543002
@rafaelfranca rafaelfranca Merge pull request #6445 from chancancode/3-2-stable_restore_frozen_s…
…tate_on_rollback

Restore the frozen state on rollback. (Backports #6420)
9ee8528
@chancancode chancancode Fixes the build break caused by 9ee8528 in #6445.
Ruby 1.8 raises a TypeError when trying to modify a frozen Hash, while
Ruby 1.9 raises a RuntimeError instead. Also, Ruby < 1.9.3 uses a
lowercase 'hash' in the exception message while Ruby >= 1.9.3 uses an
uppercase 'Hash' instead. This commit normalizes those issues in the
test case.
d3715f6
@rafaelfranca rafaelfranca Merge pull request #6451 from chancancode/3-2-stable_restore_frozen_s…
…tate_on_rollback

Fixes the build break caused by 9ee8528 in #6445.
ff3cddf
Commits on May 23, 2012
@Juanmcuello Juanmcuello Use Shellwords to scape arguments in db:structure:dump for PostgreSQL.
fixes #5913
587de84
Andrew Selder Synchronize the ConnectionPool#release method to avoid thread safety …
…issues [#6464]

Fixes #6464

Synchronize the contents of the release method in ConnectionPool due to
errors when running in high concurrency environments.

    Detected invalid hash contents due to unsynchronized modifications
with concurrent users
    org/jruby/RubyHash.java:1356:in `keys'
/usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a
ctive_record/connection_adapters/abstract/connection_pool.rb:294:in
`release'

/usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a
ctive_record/connection_adapters/abstract/connection_pool.rb:282:in
`checkin'
e663aa3
@tenderlove tenderlove Merge pull request #6467 from aselder/3-2-stable
Synchronize the body of the ConnectionPool#release method to improve thread safety.
356f2a6
Commits on May 24, 2012
@carlosantoniodasilva carlosantoniodasilva Merge pull request #5925 from Juanmcuello/pg_structure_dump
Quote arguments in db:structure:dump for PostgreSQL.
a9af9f1
Commits on May 25, 2012
@rafaelfranca rafaelfranca Merge pull request #5244 from fotos/myqsl2_wait_timeout
Maximum wait_timeout on Windows is 2147483
c90f3de
Commits on May 26, 2012
@bdurand bdurand remove unnecessary memcache equire in ActionDispatch::Session::CacheS…
…tore
ba6d935
Commits on May 27, 2012
@josevalim josevalim Merge pull request #6494 from pwim/no-memcache-require
memcache require not needed for cache store
81ad94e
@drogus drogus Fix railties_order when application object is passed
railites_order method, introduced in 40b19e0, had a bug that was causing
loading application instance twice in initializers if railties_order
already included application instance. So for example

    railties_order = [Foo::Engine, :main_app, Bar::Engine]

would result in such railties array:

    [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine]

In order to fix it, we need to check for existence of application in
both railties_order and railties arrays.
0e69705
Commits on May 28, 2012
@bkzl bkzl Display annotations from .coffee files in `rake notes` 4ababde
@tenderlove tenderlove bumping to 3.2.4.rc1 fe4dfdd
Commits on May 29, 2012
@floehopper floehopper Exceptions like Interrupt should not be rescued in tests.
This is a back-port of rails/rails#6525. See the commit notes there for
details.
0813b45
@rafaelfranca rafaelfranca Merge pull request #6531 from freerange/3-2-stable-minitest-passthrou…
…gh-exceptions

Exceptions like Interrupt should not be rescued in tests.
12e5c72
Commits on May 30, 2012
@oscardelben oscardelben Remove irrelevant assertion 2f71d40
@carlosantoniodasilva carlosantoniodasilva Merge pull request #6519 from oscardelben/3-2-stable
Display annotations in coffee files
f09ae85
Erich Menge True, False, and Nil should be represented in as_json as themselves.
Conflicts:

	activesupport/lib/active_support/json/encoding.rb
	activesupport/test/json/encoding_test.rb
624f801
@tenderlove tenderlove Merge pull request #5810 from kennyj/fix_5797
Fix #5797. Error calling dup method on AR model with serialized field
Conflicts:
	activerecord/lib/active_record/core.rb
c470001
Erich Menge Deprecate ActiveSupport::JSON::Variable bcfa013
@drogus drogus Merge pull request #6553 from erichmenge/3-2-stable-json-patch
3 2 stable json patch
9f1b689
@rafaelfranca rafaelfranca Merge pull request #6477 from steveklabnik/close_discovered_pg_connec…
…tion

Properly discover a connection is closed in postgresql_adapter
b6727a1
@tenderlove tenderlove predicate builder should not recurse for determining where columns.
Thanks to Ben Murphy for reporting this

CVE-2012-2661
71f7917
@tenderlove tenderlove Strip [nil] from parameters hash.
Thanks to Ben Murphy for reporting this!

CVE-2012-2660
dff6db1
Commits on May 31, 2012
@parndt parndt Revert "Removes unneeded caching from ActiveRecord::Base.relation"
This reverts commit ebfa58a.

This change caused a regression in my application's tests:

* Failing build http://travis-ci.org/#!/resolve/refinerycms/builds/1461242

Broken tests pass after this change is reverted.
4ce7f98
@tenderlove tenderlove Merge pull request #6558 from parndt/fix_regression
Fix regression
4c8805d
@tenderlove tenderlove Merge pull request #6558 from parndt/fix_regression
Fix regression
ac465d5
Martin O'Connor Changed symbol platform to platforms for the commented out call to ge…
…m 'therubyracer'.

Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms.
Updating tests.
9bbdceb
@rafaelfranca rafaelfranca Merge pull request #6562 from martinoconnor/generator-fix-stable
3-2-stable Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.
f8f6ad6
@tenderlove tenderlove updating changelogs d3e5d1c
@tenderlove tenderlove Merge branch '3-2-stable-sec' into 3-2-rel
* 3-2-stable-sec:
  Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
  predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
7182748
@tenderlove tenderlove adding security notifications to CHANGELOGs 44aca7b
@tenderlove tenderlove bumping to 3.2.4 febd652
@tenderlove tenderlove Merge branch '3-2-stable-sec' into 3-2-stable
* 3-2-stable-sec:
  Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
  predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
  bumping to 3.2.4.rc1
d66fd08
@tenderlove tenderlove Merge branch '3-2-rel' into 3-2-stable
* 3-2-rel:
  bumping to 3.2.4
  adding security notifications to CHANGELOGs
  updating changelogs
  Merge pull request #6558 from parndt/fix_regression
4df9680
Commits on Jun 01, 2012
@pixeltrix pixeltrix Restore behavior of Active Record 3.2.3 scopes
A series of commits relating to preloading and scopes caused a regression.
Cloning the relation calls initialize_copy which resets a number of instance
variables to nil. Without this the scope thinks that it is already loaded
when it is called again.

Reverts the following commits:
13f1401
8491740
dffbb52

Fixes #6575, #6576 & #6577
7056079
@tenderlove tenderlove bumping to 3.2.5 b57fa0b
@amatsuda amatsuda remove unneeded blank line from !namespeced? controller generators 8984bc2
@rafaelfranca rafaelfranca Merge pull request #6587 from amatsuda/controller_generator_remove_bl…
…ank_line_32

Backporting #6586 patch to 3-2-stable
ecd1722
@drogus drogus Include routes.mounted_helpers into integration tests
In integration tests, you might want to use helpers from engines that
you mounted in your application. It's not hard to add it by yourself,
but it's unneeded boilerplate. mounted_helpers are now included by
default. That means that given engine mounted like:

    mount Foo::Engine => "/foo", :as => "foo"

you will be able to use paths from this engine in tests this way:

    foo.root_path #=> "/foo"

(closes #6573)
8d4f63a
@rafaelfranca rafaelfranca Add release date of 3.2.5 on the CHANGELOG b13d89e
@nbibler nbibler Use to_model delegates for polymorphic route generation 537ede9
@josevalim josevalim Merge pull request #6588 from nbibler/polymorphic_to_model
Correct the use of to_model in polymorphic routing
5b6b0df
@yahonda yahonda Skip test_remove_column_with_array_as_an_argument_is_deprecated with …
…Oracle adapter.

Because Oracle adapter supports only remove_column :table_name, :column_name syntax
and it has never supported remove_column :table_name, [:column_name].
7544c7a
@drogus drogus Allow to use mounted helpers in ActionView::TestCase
Similarly to 6525002, this allows to use routes helpers for mounted
helpers, but this time in ActionView::TestCase
f550d4d
@rafaelfranca rafaelfranca Merge pull request #6593 from yahonda/skip_test_remove_column_with_ar…
…ray_as_an_argument_is_deprecated

Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle
43f0af4
Commits on Jun 04, 2012
@earnold earnold Add failing test for 3.2.5 datetime attribute regression bebbdb5
@kennyj kennyj Fix #6591. If a field with timezone isn't changed, we don't call will…
…_change!.
510ef2b
@rafaelfranca rafaelfranca Merge pull request #6622 from kennyj/fix_6591-32
[3-2-stable back ported] Fix #6591 Rails 3.2.5 Regression: incorrect _changed? for datetimes
9f52d15
Commits on Jun 05, 2012
@carlosgaldino carlosgaldino Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` op…
…tion

This deprecation applies to:
`button_to`
`button_tag`
`image_submit_tag`
`link_to`
`submit_tag`

As :confirm is an UI specific option is better to use the data attributes,
teaching users about unobtrusive JavaScript and how Rails works with it.
fc092a9
@rafaelfranca rafaelfranca Merge pull request #6613 from carlosgaldino/3-2-data-confirm
Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option
6347554
@rafaelfranca rafaelfranca Add test to flash sweep after two redirects
This test is needed to avoid regressions in the way that flash works
now (swept in every request).
f7cde3e
@rafaelfranca rafaelfranca Revert "fix the Flash middleware loading the session on every request…
… (very dangerous especially with Rack::Cache), it should only be loaded when the flash method is called"

This reverts commits e3069c6 and 2b2983d.

Reason: This add a non-backward compatible change in the way that flash
works now (swept in every request).
3cba6ee
Commits on Jun 06, 2012
@kuroda kuroda Fix human attribute_name to handle deeply nested attributes
This is a back-port of b0e2fc8 to Rails 3.2.
See #5843 and #3859 also.
029936e
@josevalim josevalim Merge pull request #6642 from kuroda/3-2-activemodel-translation-patch
Fix human attribute_name to handle deeply nested attributes
6b6c1de
Commits on Jun 07, 2012
@jonleighton jonleighton Revert "Perf: Don't load the association for #delete_all."
This reverts commit b98d1e2.

Closes #6609

Conflicts:

	activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
959fb8e
@jonleighton jonleighton Make test cover previous reversion 68d3e1f
@drogus drogus Fix asset tags for files with more than one dot
After the fix done in 39f9f02, there are cases that will not work
correctly. If you have file with "2 extensions", like foo.min.js and you
reference the file without extension, like:

    javascript_include_tag "foo.min"

it will fail because sprockets finds foo.min.js with foo.min argument.

This commit fixes this case and will get the right file even when
referrencing it without extension.

(closes #6598)
5b0a891
@drogus drogus Fix railties test suite
Apparently asset_environment should not be invoked if it's not needed.
This fixes broken build by getting back to the code more similar to the
version changed here: 5b0a891
fa352c4
Commits on Jun 08, 2012
@arunagw arunagw Removed protected as we already doing it above. 7ad5f8b
@arunagw arunagw We should not include engine.rake file into rake
if we are passing -T which is skip_test_unit

See issue #6673 for more details.

I saw that we are not creating dummy app even if 
we do skip_test_unit. 

Fixes #6673
8b1d475
@rafaelfranca rafaelfranca Merge pull request #6677 from arunagw/3-2-stable
Removed protected as we already doing it above.
dfb1ebe
@rafaelfranca rafaelfranca Merge pull request #6678 from arunagw/fix_issue_6673
Fix issue 6673
0e4d16f
@drogus drogus Don't add sqlite3 to gemspec with -O on rails plugin new
(closes #6672)
8475cdd
Commits on Jun 09, 2012
@tiegz tiegz ActiveRecord#attributes optimization: minimize objects created 6e4a064
@achamian achamian buffered logger is initialized with the log level passed trough the i…
…nitializer
01f8f29
@arunagw arunagw Duplicate tests removed. f36fd0e
@pixeltrix pixeltrix Merge pull request #6689 from arunagw/duplicate_test_removed
Duplicate test removed
6900a4e
@josevalim josevalim Merge pull request #6687 from tiegz/3-2-optimizations
ActiveRecord#attributes optimization: minimize objects created
eaeebc2
Commits on Jun 10, 2012
@jkraemer jkraemer fix namespace collision with test-unit-activesupport e66c240
@josevalim josevalim Merge pull request #6693 from jkraemer/3-2-stable
Bugfix: Namespace collision with test-unit-activesupport 1.0.0
6cc941d
@rafaelfranca rafaelfranca Merge pull request #6695 from kennyj/fix_6635
Fix #6635. We should call Scoping methods, before calling Array methods.
5dfb01e
@rafaelfranca rafaelfranca Merge pull request #6688 from c42engineering/buffered_logger_level_wh…
…ile_creation

BufferedLogger level while creation
35c89a4
@iaddict iaddict Minimal change to query generation of exists? that makes SQLServer an…
…d others happy that do not work without a column alias.

Conflicts:
	activerecord/lib/active_record/relation/finder_methods.rb
dd286a4
@rafaelfranca rafaelfranca Add test to column alias in `exists?` SQL.
This behavior was added in dd286a4

Closes #1139.

Fixes #2553, #1141, #1623 and #2062.
179276e
@rafaelfranca rafaelfranca Remove warning 9e6eb8b
Commits on Jun 11, 2012
@rafaelfranca rafaelfranca Merge pull request #6521 from Empact/throw-result
Fix that #exists? can blow up with ThrowResult exception
Conflicts:
	activerecord/lib/active_record/relation/finder_methods.rb
bbec883
@rafaelfranca rafaelfranca Merge pull request #6698 from yahonda/address_ora_911_master
Address ORA-00911 errors because of the heading underscore.
c9f27e3
@rafaelfranca rafaelfranca Merge pull request #6690 from suginoy/fix-templates-copy
Fix: 'rake rails:templates:copy' doesn't work
Conflicts:
	railties/test/application/rake_test.rb
0391ae9
@kennyj kennyj Fix GH #3163. Should quote database on mysql/mysql2.
Conflicts:

	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
22994b2
@kennyj kennyj Change the string to use in test case.
Conflicts:

	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
	activerecord/test/cases/adapters/mysql2/schema_test.rb
0ccdeeb
@ernie ernie Additional fix for CVE-2012-2661
While the patched PredicateBuilder in 3.1.5 prevents a user
from specifying a table name using the `table.column` format,
it doesn't protect against the nesting of hashes changing the
table context in the next call to build_from_hash. This fix
covers this case as well.
cc2903d
@tenderlove tenderlove Array parameters should not contain nil values. 38edea0
@tenderlove tenderlove updating changelogs 301974a
@tenderlove tenderlove updating changelogs with security fixes ceb8ec3
@tenderlove tenderlove bumping version numbers ee4209a
Commits on Jun 12, 2012
@tenderlove tenderlove updating changelogs 8381d39