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 Oct 29, 2012
@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
Something went wrong with that request. Please try again.