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 Jan 20, 2012
@jonleighton jonleighton Fix another race condition.
From 2c667f6.

Thanks @pwnall for the heads-up.

Conflicts:

	activerecord/lib/active_record/core.rb
fab664a
Commits on Jan 21, 2012
Jonathan Roes document `:raise` option support for several helpers [ci skip] c701358
@kennyj kennyj Fix GH #4580. Rails 3.2: uninitialized constant ActiveSupport::Tagged…
…Logging::ERROR
caf7856
@josevalim josevalim Merge pull request #4582 from kennyj/fix_4580
Fix  GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR
a720e34
@waseem waseem Remove deprecation warning from console output when running
activesupport tests.
892c670
@josevalim josevalim Merge pull request #4586 from waseem/assert_with_no_deprecation_warnings
Assert with no deprecation warnings activesupport tests.
d5dde37
Commits on Jan 22, 2012
@jviney jviney Fix `$rails_rake_task` global variable warning without replacing the …
…value of $rails_rake_task if it is already set.

Fixes #4591.

Signed-off-by: José Valim <jose.valim@gmail.com>
9ab2904
@carlosantoniodasilva carlosantoniodasilva Add missing require to Array#wrap in generators action methods d246da1
@iHiD iHiD Allow form.select to accept ranges. c6dcc35
@josevalim josevalim Merge pull request #4604 from ihid/3-2-stable
3-2-stable: Fixed regression - unable to use a range as choices for form.select.
334e5ca
@josevalim josevalim Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fi…
…ne with bash, zsh, etc, closes #4602
ede01ce
Commits on Jan 23, 2012
@jviney jviney The deprecated ActiveSupport::Base64.decode64 method should call ::Ba…
…se64.decode64 not ::Base64.encode64
44319ef
@vijaydev vijaydev Merge pull request #4611 from jviney/3-2-stable
Fix ActiveSupport::Base64.decode64
70d81b3
@vijaydev vijaydev test base64 encode and decode 912f144
@josevalim josevalim Merge pull request #4601 from carlosantoniodasilva/patch-1
Add missing require to Array#wrap in generators action methods
b840461
Commits on Jan 24, 2012
@tenderlove tenderlove Added custom regexps to ASTs that have literal nodes on either side of
symbol nodes.  Fixes #4585
3913b51
@tenderlove tenderlove work against 1-0-stable until a new journey is released 1a56a76
@kennyj kennyj Fix GH #4344. A defined callback in extended module is called too.
Conflicts:

	activesupport/test/callbacks_test.rb
dc826f9
@indrekj indrekj Add failing test for date_select
date_select does not work when day is discarded, include blank option is
enabled and struct date itself is nil.
d4cfc4c
@indrekj indrekj Fix date_select nil and blank and order case d92b5fe
@joevandyk joevandyk datetime_select should work with -/+ infinity dates 59a408e
@rafaelfranca rafaelfranca Fix date_select with discard_month and discard_year options
Closes #4553 and #4633
c4b7ca0
@tenderlove tenderlove Merge pull request #4514 from brainopia/update_timezone_offets
Update time zone offset information
e0fe62b
@josevalim josevalim Merge pull request #4641 from rafaelfranca/date_select-fix-3-2
date_select fixes [3-2-stable]
5a66d33
@rafaelfranca rafaelfranca Remove unused variables to avoid warnings 3cd28e2
@josevalim josevalim Merge pull request #4643 from rafaelfranca/3-2-stable
Remove unused variables to avoid warnings
dc81d00
@tenderlove tenderlove Merge pull request #4639 from joevandyk/datetime-infinity-select-fix
datetime_select fix for dates of -infinity and +infinity
1d67f1a
Commits on Jan 25, 2012
@pwim pwim allow requiring of 'active_model/naming'
Requiring 'active_model/naming' will raise an uninitialized constant
ActiveSupport::Deprecation exception because the module core extension
doesn't require 'active_support/deprecation'. This require cannot be
added to the core extension because of circular dependency issues.
75d58fe
@josevalim josevalim Merge pull request #4654 from pwim/explicit-deprecation-require
Explicit deprecation require
9e9e17a
@pwim pwim Test for unicode path support
This is currently broken due to a bug in journey.
22980e0
@tenderlove tenderlove Merge pull request #4658 from pwim/unicode-paths
Test for unicode path support
11e88a4
@damln damln example bracket error fd9d394
@rohit rohit remove extra 'the' a267090
@carlosantoniodasilva carlosantoniodasilva Fix custom validation methods section in AR validations and callbacks…
… guide

The methods validate_on_create and validate_on_update are not available
anymore in Rails, this removes them from the guide and adds an example
on how to use validate with the :on option.
6a85c45
@carlosantoniodasilva carlosantoniodasilva Change ActiveRecord::Errors to ActiveModel::Errors in guides
Use ActiveModel::Errors in inflection example docs as well.

Also fixes wrong information and link to locale file related to
Errors#full_messages in I18n guide.
eb171fa
@carlosantoniodasilva carlosantoniodasilva Improve field error proc example in validations guide 79a0488
@carlosantoniodasilva carlosantoniodasilva Fix callbacks order for destroying an object in validations guide
Also add around save to creating/updating callbacks order, and fix save
example with no validation
2d73f70
@lunks lunks Duping log handler. fixes #4668 c9cd0eb
@vijaydev vijaydev Merge pull request #4673 from carlosantoniodasilva/validation-guides-…
…update-3-2

Validation guides update 3 2
b023921
@tenderlove tenderlove Merge pull request #4675 from lunks/3-2-stable
Duping log handler on buffered logger silencer.
1a93eaa
Commits on Jan 26, 2012
@lest lest call to_s on value passed to table_name=
Signed-off-by: José Valim <jose.valim@gmail.com>
36d7af3
@brainopia brainopia Fix contributing guide to reflect preferred position on indentation 3a087b8
@fxn fxn disable automatic explain if there is no logger [closes #4671] 2483460
@fxn fxn registers 2483460 in the CHANGELOG 2809375
@rafaelfranca rafaelfranca Remove extra attributes from HABTM join tables in AR tests
HABTM Join tables should not have extra attributes

When extra attributes is needed in HABTM join tables is better to use
`has_many :through` association.

Fix #4653
06dcd9c
@tenderlove tenderlove global variables may not be set depending on the match. fixes #4703 7ba3ecc
@tenderlove tenderlove Merge pull request #4696 from rafaelfranca/issue-4653
Remove extra attributes from HABTM join tables in AR tests
5ac5acd
@tenderlove tenderlove bumping journey to 1.0.1 70cbb1c
@atambo atambo safe_constantize should handle wrong constant name NameErrors Fixes #…
…4710

Signed-off-by: José Valim <jose.valim@gmail.com>
6c367a0
@josevalim josevalim Revert usage of safe constantize
Signed-off-by: José Valim <jose.valim@gmail.com>
c134f24
@fxn fxn CHANGELOG revision for v3.2.1 97e8d1d
@fxn fxn updating RAILS_VERSION 67b8fbc
Something went wrong with that request. Please try again.