Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4675 from lunks/3-2-stable | Aaron Patterson | 2012-01-25 | 1 | -1/+1 |
|\ | | | | | Duping log handler on buffered logger silencer. | ||||
| * | Duping log handler. fixes #4668 | Pedro Nascimento | 2012-01-25 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #4673 from carlosantoniodasilva/validation-guides-update-3-2 | Vijay Dev | 2012-01-25 | 6 | -25/+34 |
|\ \ | |/ |/| | Validation guides update 3 2 | ||||
| * | Fix callbacks order for destroying an object in validations guide | Carlos Antonio da Silva | 2012-01-25 | 1 | -2/+4 |
| | | | | | | | | | | Also add around save to creating/updating callbacks order, and fix save example with no validation | ||||
| * | Improve field error proc example in validations guide | Carlos Antonio da Silva | 2012-01-25 | 1 | -7/+2 |
| | | |||||
| * | Change ActiveRecord::Errors to ActiveModel::Errors in guides | Carlos Antonio da Silva | 2012-01-25 | 6 | -14/+14 |
| | | | | | | | | | | | | | | 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. | ||||
| * | Fix custom validation methods section in AR validations and callbacks guide | Carlos Antonio da Silva | 2012-01-25 | 1 | -2/+14 |
| | | | | | | | | | | | | 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. | ||||
* | | remove extra 'the' | Rohit Arondekar | 2012-01-26 | 1 | -1/+1 |
| | | |||||
* | | example bracket error | Damian Le Nouaille | 2012-01-26 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #4658 from pwim/unicode-paths | Aaron Patterson | 2012-01-25 | 1 | -0/+20 |
|\ \ | | | | | | | Test for unicode path support | ||||
| * | | Test for unicode path support | Paul McMahon | 2012-01-25 | 1 | -0/+20 |
| | | | | | | | | | | | | This is currently broken due to a bug in journey. | ||||
* | | | Merge pull request #4654 from pwim/explicit-deprecation-require | José Valim | 2012-01-24 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Explicit deprecation require | ||||
| * | | allow requiring of 'active_model/naming' | Paul McMahon | 2012-01-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge pull request #4639 from joevandyk/datetime-infinity-select-fix | Aaron Patterson | 2012-01-24 | 2 | -1/+13 |
|\ \ \ | | | | | | | | | datetime_select fix for dates of -infinity and +infinity | ||||
| * | | | datetime_select should work with -/+ infinity dates | Joe Van Dyk | 2012-01-24 | 2 | -1/+13 |
| | | | | |||||
* | | | | Merge pull request #4643 from rafaelfranca/3-2-stable | José Valim | 2012-01-24 | 1 | -3/+0 |
|\ \ \ \ | | | | | | | | | | | Remove unused variables to avoid warnings | ||||
| * | | | | Remove unused variables to avoid warnings | Rafael Mendonça França | 2012-01-24 | 1 | -3/+0 |
|/ / / / | |||||
* | | | | Merge pull request #4641 from rafaelfranca/date_select-fix-3-2 | José Valim | 2012-01-24 | 2 | -4/+41 |
|\ \ \ \ | | | | | | | | | | | date_select fixes [3-2-stable] | ||||
| * | | | | Fix date_select with discard_month and discard_year options | Rafael Mendonça França | 2012-01-24 | 2 | -2/+39 |
| | | | | | | | | | | | | | | | | | | | | Closes #4553 and #4633 | ||||
| * | | | | Fix date_select nil and blank and order case | Indrek Juhkam | 2012-01-24 | 2 | -18/+2 |
| | | | | | |||||
| * | | | | Add failing test for date_select | Indrek Juhkam | 2012-01-24 | 1 | -0/+16 |
| |/ / / | | | | | | | | | | | | | | | | | date_select does not work when day is discarded, include blank option is enabled and struct date itself is nil. | ||||
* / / / | Merge pull request #4514 from brainopia/update_timezone_offets | Aaron Patterson | 2012-01-24 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Update time zone offset information | ||||
* | | | Fix GH #4344. A defined callback in extended module is called too. | kennyj | 2012-01-24 | 2 | -5/+62 |
| | | | | | | | | | | | | | | | | | | Conflicts: activesupport/test/callbacks_test.rb | ||||
* | | | work against 1-0-stable until a new journey is released | Aaron Patterson | 2012-01-23 | 1 | -1/+1 |
| | | | |||||
* | | | Added custom regexps to ASTs that have literal nodes on either side of | Aaron Patterson | 2012-01-23 | 2 | -1/+82 |
| | | | | | | | | | | | | symbol nodes. Fixes #4585 | ||||
* | | | Merge pull request #4601 from carlosantoniodasilva/patch-1 | José Valim | 2012-01-23 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Add missing require to Array#wrap in generators action methods | ||||
| * | | | Add missing require to Array#wrap in generators action methods | Carlos Antonio da Silva | 2012-01-22 | 1 | -0/+1 |
| | | | | |||||
* | | | | test base64 encode and decode | Vijay Dev | 2012-01-23 | 1 | -0/+9 |
| | | | | |||||
* | | | | Merge pull request #4611 from jviney/3-2-stable | Vijay Dev | 2012-01-23 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix ActiveSupport::Base64.decode64 | ||||
| * | | | | The deprecated ActiveSupport::Base64.decode64 method should call ↵ | Jonathan Viney | 2012-01-23 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | ::Base64.decode64 not ::Base64.encode64 | ||||
* | | | | Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with ↵ | José Valim | 2012-01-22 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | bash, zsh, etc, closes #4602 | ||||
* | | | | Merge pull request #4604 from ihid/3-2-stable | José Valim | 2012-01-22 | 2 | -0/+17 |
|\ \ \ \ | |/ / / |/| | | | 3-2-stable: Fixed regression - unable to use a range as choices for form.select. | ||||
| * | | | Allow form.select to accept ranges. | Jeremy Walker | 2012-01-22 | 2 | -0/+17 |
| | | | | |||||
* | | | | Fix `$rails_rake_task` global variable warning without replacing the value ↵ | Jonathan Viney | 2012-01-22 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of $rails_rake_task if it is already set. Fixes #4591. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | | Merge pull request #4586 from waseem/assert_with_no_deprecation_warnings | José Valim | 2012-01-21 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | Assert with no deprecation warnings activesupport tests. | ||||
| * | | | | Remove deprecation warning from console output when running | Waseem Ahmad | 2012-01-22 | 1 | -1/+3 |
|/ / / / | | | | | | | | | | | | | activesupport tests. | ||||
* | | | | Merge pull request #4582 from kennyj/fix_4580 | José Valim | 2012-01-21 | 2 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | Fix GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR | ||||
| * | | | | Fix GH #4580. Rails 3.2: uninitialized constant ↵ | kennyj | 2012-01-22 | 2 | -1/+5 |
|/ / / / | | | | | | | | | | | | | ActiveSupport::TaggedLogging::ERROR | ||||
* / / / | document `:raise` option support for several helpers [ci skip] | Jonathan Roes | 2012-01-21 | 1 | -0/+3 |
|/ / / | |||||
* / / | Fix another race condition. | Jon Leighton | 2012-01-20 | 4 | -6/+23 |
|/ / | | | | | | | | | | | | | | | | | | | From 2c667f69aa2daac5ee6c29ca9679616e2a71532a. Thanks @pwnall for the heads-up. Conflicts: activerecord/lib/active_record/core.rb | ||||
* | | Preparing for 3.2.0 release | David Heinemeier Hansson | 2012-01-20 | 16 | -19/+17 |
| | | |||||
* | | update release notes [ci skip] | Vijay Dev | 2012-01-20 | 1 | -2/+0 |
| | | |||||
* | | Update CHANGELOG | José Valim | 2012-01-19 | 1 | -2/+0 |
| | | |||||
* | | Do not deprecate performed? | José Valim | 2012-01-19 | 3 | -6/+10 |
| | | |||||
* | | add uglifier version info in the 'what to update' section | Vijay Dev | 2012-01-19 | 1 | -0/+1 |
| | | |||||
* | | fix duplicate ids for the headers [ci skip] | Vijay Dev | 2012-01-19 | 1 | -7/+7 |
| | | |||||
* | | document AR::Base#with_lock in release notes [ci skip] | Vijay Dev | 2012-01-19 | 1 | -0/+27 |
| | | |||||
* | | update the getting_started guide code [ci skip] | Vijay Dev | 2012-01-19 | 9 | -24/+57 |
| | | |||||
* | | Merge pull request #4531 from exviva/pessimistic_with_lock | Aaron Patterson | 2012-01-19 | 4 | -1/+81 |
| | | | | | | | | Add ActiveRecord::Base#with_lock | ||||
* | | Fix small typo in mail_to docs in url_helper.rb | Simon Baird | 2012-01-19 | 1 | -1/+1 |
| | |