Skip to content
This repository
  • 9,864 commits
  • 1,850 files changed
  • 11 comments
  • 64 contributors
This comparison is big! We're only showing the most recent 250 commits
Mar 28, 2012
Santiago Pastorino spastorino Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms
Embed auth token in remote forms
0d052c0
Santiago Pastorino spastorino Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms
Embed auth token in remote forms
84ca8c8
Aaron Patterson tenderlove Test for #5549.
Cherry-picked from e96d04a.

Conflicts:

	activerecord/lib/active_record/attribute_methods/read.rb
4c44ca5
Jon Leighton jonleighton Fix #5549. 1b9fd79
Piotr Sarnacki drogus Cover one more case in auth_token and remote forms
If embedding auth_token in remote forms is off and we
pass a value for auth_token it should respect it.
d5980b5
Piotr Sarnacki 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
Yasuo Honda yahonda Change the order argument from ('id') to ('taggings.id')
to address ORA-00918 error
ef3f809
Santiago Pastorino spastorino Merge pull request #5640 from yahonda/address_ora_00918_with_oracle
Address an error for test_has_many_through_polymorphic_has_one with Oracle
f369f77
Santiago Pastorino spastorino Set proper rendered_format when doing render :inline
Closes #5632
5747e53
Santiago Pastorino spastorino Set proper rendered_format when doing render :inline
Closes #5632
87825a6
Anuj Dutta andhapp Changed the config.assets.manifest to nil in the comments in the prod…
…uction config template.
a157d59
Santiago Pastorino spastorino Merge pull request #5644 from andhapp/fix-config-asset-manifest-3-2
Changed the config.assets.manifest to nil
2b2a760
Mar 29, 2012
Vijay Dev vijaydev fix incorrect url in the deprecation message for vendor/plugins [ci s…
…kip]
1d753ab
Vijay Dev vijaydev fix incorrect url in the deprecation message for vendor/plugins [ci s…
…kip]
921c404
Santiago Pastorino spastorino Add missing CHANGELOG entry dd69076
Santiago Pastorino spastorino Add missing CHANGELOG entry b395ca1
Santiago Pastorino spastorino Bumping to 3.2.3.rc2 5284e65
Arturo Pie arturopie Adds a test that breaks IM when using #select b29e868
Arturo Pie arturopie Do not add record to identity map if the record doesn't have values f…
…or all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
2c8f84d
Arturo Pie arturopie refactor the checking of the attributes of the record in IdentityMap#…
…add, so it's more readable
714a2c8
Arturo Pie arturopie refactor instantiate method in base, so we remove nesting if's which …
…make the code harder to read. Minor changes to contain_all_columns in IdentityMap.

Conflicts:

	activerecord/lib/active_record/base.rb
6896cd4
Mar 30, 2012
Santiago Pastorino spastorino Remove the leading \n added by textarea on assert_select 13fe190
Santiago Pastorino spastorino Remove the leading \n added by textarea on assert_select 5c7bb86
Jon Leighton jonleighton Fix #5667. Preloading should ignore scoping.
Conflicts:

	activerecord/test/cases/associations/eager_test.rb
dffbb52
Santiago Pastorino spastorino Bump up to 3.2.3 45d6cd9
Santiago Pastorino spastorino Merge branch '3-2-3' into 3-2-stable 69465d9
Aaron Patterson tenderlove Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find…
…_select

Fixing Identity Map when using find select in rails 3.2
9894d16
Mar 31, 2012
Rafael Mendonça França rafaelfranca Fix the redirect when it receive blocks with arity of 1.
Closes #5677
27fc6ec
Apr 02, 2012
Piotr Sarnacki drogus Usage file in generators shouldn't be fetched only based on source_root
In case `source_roout` is not set, `default_source_root` is used,
which includes also `templates` directory. If there is no `templates`
directory, `default_source_root` is not available and USAGE will not
be displayed. USAGE should be also checked based on default
directory excluding `templates`.
515e1d3
Apr 03, 2012
Tim Pope tpope DATABASE_URL allows omission of database.yml 8e315b0
Kevin Moore kevmoo Remove unused 'cast_code' variable 6f19262
Terence Lee hone test initializer logic for DATABASE_URL env var 93f25ac
Terence Lee hone log which config format AR uses to connect with d46ad34
Aaron Patterson tenderlove Merge pull request #5727 from hone/ar_database_url_logging
ActiveRecord configuration logging
c4d3102
Apr 04, 2012
Santiago Pastorino spastorino Merge pull request #5188 from jlxw/patch-1
logger.silence is deprecated
6663dd0
Rafael Mendonça França rafaelfranca Fix tests of benchmark with silence equals to true 1124ac0
Santiago Pastorino spastorino Merge pull request #5737 from rafaelfranca/3-2-stable
Fix tests of benchmark with silence equals to true
56d9945
Apr 06, 2012
Anil Wadghule anildigital Fix Rails version in getting started guide. 1cd939a
Vijay Dev vijaydev Merge pull request #5765 from anildigital/3-2-stable
Update getting started guide to change Rails version to Rails 3.2
bfd5c84
Apr 07, 2012
Anil Wadghule anildigital Fix 'Everyday Git' link 05d4ccf
Apr 08, 2012
Rafael Mendonça França rafaelfranca default_url_options does not receive one argument anymore 5c7bcfc
Santiago Pastorino spastorino Merge pull request #5784 from rafaelfranca/default_url-3-2
[3-2-stable] Document that default_url_options must return a hash with symbolized keys
e7671b5
Apr 09, 2012
Rafael Mendonça França rafaelfranca Document that default_url_options must return a hash with symbolized
keys
6f4f499
Xavier Noria fxn rewords the section about default_url_options in the Action Controlle…
…r Overview guide
b125db8
Xavier Noria fxn Merge pull request #5725 from kevmoo/remove_unused_castcode
Remove unused castcode
dab76b1
Apr 10, 2012
Arun Agrawal arunagw README fix! [skip ci] b1c28d7
Vijay Dev vijaydev Merge pull request #5799 from arunagw/readme_fix
Readme fix
a85ffd0
Aaron Patterson tenderlove add the class name to the assertion message ca0c0a2
Aaron Patterson tenderlove bigdecimal can be duped on Ruby 2.0
Conflicts:

	activesupport/test/core_ext/duplicable_test.rb
2991370
Aaron Patterson tenderlove probably should require the objects we monkey patch. fedd87c
Jeremy Kemper jeremy Merge pull request #5800 from arunagw/bigdecimal_dup
Backport BigDecimal#duplicable? feature check from master
e0fd4fc
Apr 12, 2012
Aaron Patterson tenderlove test against ruby features in order to fix tests on Ruby 2.0 96d81e5
Jeremy Kemper jeremy Merge pull request #5820 from arunagw/more_ruby-2-0-fixes
Update test for Ruby 2 compatibility
e473e1f
Prem Sichanugrist sikachu Fix code example in generator test case c0e6a85
Vijay Dev vijaydev fix typo in readme [ci skip] efa9a1f
Apr 13, 2012
Aleksey Kulikov ask11 "rails new -h" shows message in rails directory 2f9fdbf
Apr 15, 2012
Piotr Sarnacki 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
Apr 16, 2012
Arun Agrawal arunagw multi_json is restricted to < 1.3
Some API changes are there above 1.3. 
3-2-stable
9b14e3f
Jeremy Kemper 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
Tieg Zaharia tiegz catch nil.to_sym errors in partial_renderer, and raise ArgumentError …
…instead
dcc11b2
Tieg Zaharia tiegz converting some tests to assert_raises, and DRY'ing retrieve_variable…
… changes

Conflicts:

	actionpack/test/template/render_test.rb
6b8dd70
Apr 17, 2012
Aditya Sanghi asanghi Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a…
… more maintained debugger gem
56674db
Jeremy Kemper jeremy Merge pull request #5874 from asanghi/3-2-stable
replace ruby-debug19 with debugger on Rails 3-2 stable
89f99e8
Apr 18, 2012
Norman Clarke norman Check for nil logger d92166c
Aaron Patterson tenderlove Merge pull request #5894 from norman/3-2-fix-nil-logger
Fix nil logger on 3.2
476fa7a
Santiago Pastorino spastorino Add hook for add_resource_route 3986139
Jeremy Kemper 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
Erik Michaels-Ober sferik Revert "multi_json is restricted to < 1.3 "
This reverts commit 9b14e3f.
e01bf0a
Erik Michaels-Ober sferik Use `Object#respond_to?` to determine which MultiJson API to use 5e62670
Apr 19, 2012
Benedikt Deicke 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 Deicke 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 Deicke benedikt Revert "Revert "Fix #5667. Preloading should ignore scoping.""
This reverts commit 1166d49.

Conflicts:

	activerecord/test/cases/associations/eager_test.rb
2c21a2f
Benedikt Deicke benedikt Removes unneeded caching from ActiveRecord::Base.relation ebfa58a
Jeremy Kemper jeremy Merge pull request #5898 from benedikt/3-2-stable
Readds the fix for #5667 and back ports the regression fix from #5718
b9e5c5a
Akira Matsuda 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
Apr 21, 2012
Joe Van Dyk joevandyk Only include Rake::DSL if it's defined.
rake < 0.9 doesn't define Rake::DSL.
07b1fe5
Jeremy Kemper jeremy Merge pull request #5896 from sferik/revert_5861
Revert #5861. Feature-detect which MultiJson API to use.
c3d50b3
Apr 23, 2012
Arun Agrawal arunagw ARes URL should be pointed to 3-2-stable tree not master. 210713e
Vijay Dev 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
Arun Agrawal arunagw Updated other README to point 3-2-stable 21b1a79
Vijay Dev vijaydev Merge pull request #5936 from arunagw/other_readme_fixes
Updated other README to point 3-2-stable
979e9d0
Jeremy Kemper jeremy Merge pull request #5919 from joevandyk/rake-dsl-fix
Only include Rake::DSL if it's defined (Rake >= 0.9)
dd01c11
Aaron Patterson 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
Prem Sichanugrist sikachu Fix broken test from the earlier merge conflict
Seriously people, please run the test before submitting pull request.
0f3fd78
Santiago Pastorino spastorino Merge pull request #5946 from sikachu/3-2-stable-fix-merge-conflict
Fix broken test from the earlier merge conflict
db6787a
Apr 24, 2012
Toshinori Kajihara kennyj Fix build. It seems that the Mocha's behavior were changed. d95f3d3
Jeremy Kemper jeremy Merge pull request #5968 from sikachu/3-2-stable-backport
Backport workarounds for Mocha behavior changes.
9212083
Carlos Antonio da Silva carlosantoniodasilva Add extra order clause to fix failing test on Ruby 1.8.7 20f398d
Jeremy Kemper 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
Apr 26, 2012
Vijay Dev vijaydev fix number_to_human docs [ci skip] 006de25
Apr 27, 2012
Aaron Patterson tenderlove Merge pull request #4528 from j-manu/log-tailer-fix
Fix for log tailer when the log file doesn't exist.
05bee99
Carlos Antonio da Silva carlosantoniodasilva Do not mutate options hash 7006e97
Aaron Patterson tenderlove Merge pull request #6022 from sikachu/3-2-stable-record_tag_backport
Do not mutate options hash
434be0f
Apr 28, 2012
Piotr Sarnacki 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
Piotr Sarnacki drogus Lazy load `default_form_builder` if it's passed as a string
closes #3341
beba826
Apr 29, 2012
Oscar Del Ben oscardelben Remove circular require of time/zones 61d84e0
Andrew White 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
Rafael Mendonça França rafaelfranca Fix the build.
* The method for persisted records in 3-2-branch is 'PUT'
* size is generated by default in inputs
a782aa5
Rafael Mendonça França rafaelfranca Remove warning of unused variable b18603b
José Valim josevalim Merge pull request #6051 from rafaelfranca/fix_build
Fix the build
0df261a
Andrew White pixeltrix Escape interpolated params when redirecting - fixes #5688 b608cdd
Andrew White pixeltrix Add missing require from b608cdd 4075a39
Andrew White pixeltrix Restore interpolation of path option in redirect routes 6cad407
Jeremy Kemper jeremy Merge pull request #5922 from rafaelfranca/deprecate_javascript_helpers
Deprecate link_to_function and button_to_function
8fec5d7
Apr 30, 2012
Rafael Mendonça França rafaelfranca Add missing require when helpers are used in isolation 6b8a3a0
Rafael Mendonça França rafaelfranca Deprecate link_to_function and button_to_function helpers 9dc57fe
Rafael Mendonça França rafaelfranca Add CHANGELOG entry.
Closes #5886
Closes #3093
342b54a
Rafael Mendonça França rafaelfranca Add release data to Rails 3.2.3 3005f58
Andrew White 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
Will Bryant 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
Piotr Sarnacki drogus Failing test for #6034 2b2983d
Dave Gerton 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
May 01, 2012
Dmitry Vorotilin route Fix #3993 assets:precompile task does not detect index files df84577
Dmitry Vorotilin route Added test for assets:precompile for index files 580e767
May 02, 2012
Piotr Sarnacki drogus Deprecate remove_column with array as an argument 02ca915
Jeremy Kemper jeremy Merge pull request #6095 from route/assets_precompile_task
Fix that asset precompile didn't respect the index.js convention. Fixes #3993.
ebe994f
Francesco Rodríguez frodsan Fix #4979 against 3-2-stable - delete_all raise an error if a limit i…
…s provided
4657dba
May 03, 2012
Andrew White 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
Jorge Bejar jmbejar Make sure that javascript_include_tag/stylesheet_link_tag methods in
sprockets/helpers/rails_helper.rb discard duplicated assets
0621ecb
May 04, 2012
Nick Ragaz 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
Dmitrij Mjakotnyi kucaahbe improvements in "caching_with_rails" guide - backported from docrails
Conflicts:

	railties/guides/source/caching_with_rails.textile
b4ae94f
Vijay Dev vijaydev Merge pull request #6158 from Dagnan/3-2-stable
improvements in "caching_with_rails" guide
5384bdb
Mark J. Titorenko mjtko added beginning_of_hour support to core_ext calculations for Time and…
… DateTime
145cc69
José Valim josevalim Merge pull request #4445 from nragaz/role_based_params_wrapping
specify a role for identifying accessible attributes when wrapping params
efb054b
Aaron Patterson tenderlove Merge pull request #6128 from frodsan/delete_all_limit_32
Fix #4979 against 3-2-stable
80a292c
Piotr Sarnacki drogus Give more detailed instructions in script/rails in engine
closes #4894
915879c
May 05, 2012
Jeremy Kemper 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
May 07, 2012
Kunal Shah whistlerbrk Add failing test re #3436 which demonstrates content_type is not resp…
…ected when using the :head method/shortcut
6f38348
Kunal Shah whistlerbrk If content_type is explicitly passed to the :head method use the valu…
…e or fallback
4d52738
José Valim josevalim Merge pull request #6198 from whistlerbrk/3-2-stable
Address ActionPack head method not respecting explicitly set content-type #3436
b86e0be
May 08, 2012
Arun Agrawal arunagw locking ruby-prof until we got a fix 764e2de
Santiago Pastorino spastorino Merge pull request #6200 from arunagw/3-2-stable
locking ruby-prof for now.
b12d03d
Francesco Rodríguez frodsan added docs to attribute_accessors methods 96fe0af
Vijay Dev vijaydev Merge pull request #6211 from frodsan/docs_attr_accessor_32stable
Adding docs to attribute accessor methods.
ad4d408
Francesco Rodríguez frodsan removing docs duplication 16a9a87
Vijay Dev vijaydev Merge pull request #6213 from frodsan/cut_docs_dup
Removing attribute_accessor docs duplication
5059c32
May 09, 2012
Francesco Rodríguez frodsan Fix build ba48e23
Francesco Rodríguez frodsan fix attribute_accessors docs to support 1.8 syntax dd7e7b3
Vijay Dev vijaydev Merge pull request #6218 from frodsan/fix_docs_32stable
Fix docs to support 1.8 syntax
cb242a9
Carlos Antonio da Silva 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
Andrew White pixeltrix Merge pull request #6223 from carlosantoniodasilva/remove-columns-dep…
…recation-ruby187

Stop showing deprecations for Ruby 1.8.7 with remove_column
381f6e7
Mark J. Titorenko mjtko Bring activesupport CHANGELOG up-to-date/consistent with master. 705a70f
Mark J. Titorenko 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
Vijay Dev vijaydev Merge pull request #6228 from mjtko/changelog-fixes-for-3-2-stable
Updated activesupport CHANGELOG [for 3-2-stable]
b003ddf
Piotr Sarnacki drogus Merge pull request #6219 from frodsan/fix_build
Fix build - 3.2
8f5079f
Santiago Pastorino 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
Jeremy Kemper jeremy Merge pull request #6221 from alexeymuranov/deprecate__instantiate_fi…
…xtures__arity

Deprecate ActiveRecord::Fixtures.instantiate_fixtures unused parameter
22a6072
May 10, 2012
Alexey Muranov 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
Alexey Muranov alexeymuranov Remove deprecated use of ::instantiate_fixtures 9810555
Yury Velikanau spectator Make sure TimeoutError is loaded. c2193c1
Jeremy Kemper jeremy Merge pull request #6230 from spectator/active_resource_exceptions
ActiveResource::TimeoutError is not loaded
a9fc8a9
Andrew White 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
Andrew White pixeltrix Don't ignore nil positional arguments for url helpers - fixes #6196. 66e338a
Andrew White pixeltrix Return false for exists? with new records - fixes #6199.
(cherry picked from commit fa21b73)
62f098d
May 11, 2012
Arun Agrawal arunagw Update performance profiler to work with latest ruby-prof 9d616ea
Arun Agrawal arunagw Ruby-Prof works with ruby-1.9.3 also. 4b59961
Alexey Muranov alexeymuranov Remove unused private method yaml_fixtures_key 5ecd14c
Santiago Pastorino spastorino Merge pull request #6262 from arunagw/ruby_prof_fix
Ruby prof fix
9cead4a
May 12, 2012
Erich Menge Update 'getting started' guides for new whitelist security implementa…
…tion. Closes #6286.
ccf80c2
Rafael Mendonça França rafaelfranca Merge pull request #6292 from erichmenge/3-2-stable-docfix
3 2 stable guides fix
41e7a2a
Francesco Rodríguez frodsan adding examples and docs 2f4696d
Vijay Dev vijaydev Merge pull request #6294 from frodsan/docs_backport
Adding examples and docs [3-2-stable]
3d0e7ad
May 13, 2012
Guillermo Iguaran guilleiguaran Upgrade sprockets to 2.1.3 62b74b1
Mikhail Dieterle Mik-die :foreign_key option should be on has_many side of association 3f7ed52
Santiago Pastorino spastorino Merge pull request #6299 from guilleiguaran/upgrade-sprockets-3-2-stable
Upgrade sprockets to 2.1.3
8a5b51e
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #6306 from erichmenge/3-2-stable-guide-fix
3 2 stable guide fix [ci skip]
e7d5ba3
Rafael Mendonça França rafaelfranca Merge pull request #3237 from sakuro/data-url-scheme
Support data: url scheme
9ff97b0
Rafael Mendonça França rafaelfranca Deprecate `:mouseover` options for `image_tag` helper. 1aff772
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #6266 from alexeymuranov/remove_unused_private_method
Remove unused private method
9199ddf
May 14, 2012
Egor Homakov homakov Update railties/lib/rails/generators/rails/app/templates/config/appli…
…cation.rb

Signed-off-by: José Valim <jose.valim@gmail.com>
4588684
José Valim josevalim Default escape_html_entities_in_json to true in new apps ec68258
Carlos Antonio da Silva 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
May 15, 2012
Francesco Rodríguez frodsan Backporting some docs on core_ext/hash b2f73c4
Vijay Dev vijaydev Merge pull request #6321 from frodsan/backport_docs
Backporting docs
007539d
Angelo Capilleri 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
Rafael Mendonça França rafaelfranca Merge pull request #6324 from acapilleri/dup_validation_3_2
Dup validation 3 2
9a868a0
Carlos Antonio da Silva carlosantoniodasilva Fix indent from previous merge 2dfa8b5
Angelo Capilleri add backport for the pull request #6324 e885b18
Rafael Mendonça França rafaelfranca Merge pull request #6329 from acapilleri/backport_dup_validation_3_2
Backport dup validation 3 2
8470fdb
Brian Cardarella 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
May 16, 2012
Aaron Patterson tenderlove Merge pull request #6340 from bcardarella/patch-3
Changing the indentation level of the block comment close for Sass
e3033e3
Piotr Sarnacki drogus Fix CollectionAssociation#replace to return new target (closes #6231)
Conflicts:

	activerecord/test/cases/associations/has_many_associations_test.rb
0f43592
May 17, 2012
Francesco Rodríguez frodsan fix validations docs 4bbd05c
Vijay Dev vijaydev Merge pull request #6367 from frodsan/fix_validators_docs
Fix validators docs [3-2-stable]
75e8e77
May 18, 2012
Jeremy Walker iHiD Deprecate old APIs for highlight, excerpt and word_wrap 616c91d
Rafael Mendonça França rafaelfranca Merge pull request #6377 from ihid/depreciate_old_text_helper_apis
Deprecate old APIs for highlight, excerpt and word_wrap
2802ad0
Jon Leighton jonleighton Perf: Don't load the association for #delete_all.
Bug #6289

Conflicts:

	activerecord/test/cases/associations/has_many_associations_test.rb
b98d1e2
Jon Leighton jonleighton fix #delete_all with habtm with :delete_sql 855fabc
Ernie Miller ernie Fix HABTM syntax error in Ruby 1.8.x 3b444ee
Rafael Mendonça França rafaelfranca Merge pull request #6390 from ernie/invalid-ruby18-syntax-in-habtm
Invalid ruby18 syntax in habtm
8ad8f61
José Valim 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
May 19, 2012
Piotr Sarnacki 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
Aaron Patterson tenderlove Merge pull request #6398 from pmahoney/threadsafe-connection-pool
Synchronize read and modification of @reserved_connections
879611f
Carlos Antonio da Silva 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
Piotr Sarnacki 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
Piotr Sarnacki 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
May 20, 2012
Piotr Sarnacki 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
Gavin Morrice Bodacious Fixed tag_helper data-attribute bug with BigDecimals 39b9c94
José Valim josevalim Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806…
…f7b028614c

Template concurrency fixes
fe9731e
Rafael Mendonça França 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
Piotr Sarnacki 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
May 21, 2012
Piotr Sarnacki 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
Victor Costan pwnall Postgresql doesn't accept limits on binary (bytea) columns. 36fdb72
Sergey Nartimov 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
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #6423 from lest/patch-2
assets: don't add extension if other given and file exists
f051071
Aaron Patterson tenderlove Merge pull request #6418 from pwnall/pgsql_bytea_limit3
Postgresql doesn't accept limits on binary (bytea) columns (for 3-2-stable)
5d6cca1
May 22, 2012
Piotr Sarnacki 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
Godfrey Chan 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
Rafael Mendonça França 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
Godfrey Chan 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
Rafael Mendonça França 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
Juan M. Cuello Juanmcuello Use Shellwords to scape arguments in db:structure:dump for PostgreSQL.
fixes #5913
587de84
May 23, 2012
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
Aaron Patterson tenderlove Merge pull request #6467 from aselder/3-2-stable
Synchronize the body of the ConnectionPool#release method to improve thread safety.
356f2a6
May 24, 2012
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #5925 from Juanmcuello/pg_structure_dump
Quote arguments in db:structure:dump for PostgreSQL.
a9af9f1
May 25, 2012
Rafael Mendonça França rafaelfranca Merge pull request #5244 from fotos/myqsl2_wait_timeout
Maximum wait_timeout on Windows is 2147483
c90f3de
May 26, 2012
Brian Durand bdurand remove unnecessary memcache equire in ActionDispatch::Session::CacheS…
…tore
ba6d935
May 27, 2012
José Valim josevalim Merge pull request #6494 from pwim/no-memcache-require
memcache require not needed for cache store
81ad94e
Piotr Sarnacki 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
May 28, 2012
Bartłomiej Kozal bkzl Display annotations from .coffee files in `rake notes` 4ababde
Aaron Patterson tenderlove bumping to 3.2.4.rc1 fe4dfdd
May 29, 2012
James Mead 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
Rafael Mendonça França rafaelfranca Merge pull request #6531 from freerange/3-2-stable-minitest-passthrou…
…gh-exceptions

Exceptions like Interrupt should not be rescued in tests.
12e5c72
Oscar Del Ben oscardelben Remove irrelevant assertion 2f71d40
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #6519 from oscardelben/3-2-stable
Display annotations in coffee files
f09ae85
May 30, 2012
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
Aaron Patterson 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
Piotr Sarnacki drogus Merge pull request #6553 from erichmenge/3-2-stable-json-patch
3 2 stable json patch
9f1b689
Rafael Mendonça França rafaelfranca Merge pull request #6477 from steveklabnik/close_discovered_pg_connec…
…tion

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

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

CVE-2012-2660
dff6db1
Aaron Patterson tenderlove Merge pull request #6558 from parndt/fix_regression
Fix regression
4c8805d
Aaron Patterson 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
Rafael Mendonça França 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
May 31, 2012
Philip Arndt 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
Aaron Patterson tenderlove updating changelogs d3e5d1c
Aaron Patterson 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
Aaron Patterson tenderlove adding security notifications to CHANGELOGs 44aca7b
Aaron Patterson tenderlove bumping to 3.2.4 febd652
Aaron Patterson 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
Aaron Patterson 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
Aaron Patterson tenderlove bumping to 3.2.5 b57fa0b
Jun 01, 2012
Andrew White 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