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.
Commits on Jun 01, 2012
@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