Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Revert "Fix expanding cache key for single element arrays" | David Heinemeier Hansson | 2012-01-27 | 2 | -16/+8 | |
| | | | | | | | | | | | | This reverts commit abe915f23777efe10f17d611bf5718ca855a0704. This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key. | |||||
* | | Merge check box fixes from remote-tracking branch ↵ | José Valim | 2012-01-27 | 3 | -5/+18 | |
|\ \ | |/ |/| | | | 'cantonio/checkbox-hidden-backport' into 3-2-stable | |||||
| * | don't set the hidden checkbox value if it's nil | Damien Mathieu | 2012-01-27 | 2 | -1/+9 | |
| | | ||||||
| * | check_box helper with :disabled => true generates disabled hidden field. ↵ | Tadas Tamošauskas | 2012-01-27 | 3 | -5/+8 | |
|/ | | | | fixes #1953 | |||||
* | Merge pull request #4715 from pwim/find-create-multi-args | Jon Leighton | 2012-01-27 | 2 | -1/+12 | |
| | | | | Fix regression from Rails 3.1 | |||||
* | fixes whitespace in CHANGELOG entries | Xavier Noria | 2012-01-26 | 3 | -3/+3 | |
| | ||||||
* | updating RAILS_VERSION | Xavier Noria | 2012-01-26 | 9 | -9/+9 | |
| | ||||||
* | CHANGELOG revision for v3.2.1 | Xavier Noria | 2012-01-26 | 7 | -2/+50 | |
| | ||||||
* | Revert usage of safe constantize | José Valim | 2012-01-26 | 1 | -1/+3 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | safe_constantize should handle wrong constant name NameErrors Fixes #4710 | Alex Tambellini | 2012-01-26 | 2 | -3/+4 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | bumping journey to 1.0.1 | Aaron Patterson | 2012-01-26 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #4696 from rafaelfranca/issue-4653 | Aaron Patterson | 2012-01-26 | 1 | -2/+0 | |
|\ | | | | | Remove extra attributes from HABTM join tables in AR tests | |||||
| * | Remove extra attributes from HABTM join tables in AR tests | Rafael Mendonça França | 2012-01-26 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | 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 | |||||
* | | global variables may not be set depending on the match. fixes #4703 | Aaron Patterson | 2012-01-26 | 2 | -1/+8 | |
| | | ||||||
* | | registers 2483460 in the CHANGELOG | Xavier Noria | 2012-01-26 | 1 | -3/+5 | |
| | | ||||||
* | | disable automatic explain if there is no logger [closes #4671] | Xavier Noria | 2012-01-26 | 3 | -1/+20 | |
|/ | ||||||
* | Fix contributing guide to reflect preferred position on indentation | brainopia | 2012-01-26 | 1 | -1/+1 | |
| | | | | | | | | | | | Fix incorrect recommendation from indenting after private/protected to not. Based on opinions of @spastorino, @jonleighton, @tenderlove https://github.com/rails/rails/pull/1838#issuecomment-1440281 https://en.twitter.com/#!/spastorino/status/142054749351575552 https://en.twitter.com/#!/tenderlove/status/142014046445641728 https://en.twitter.com/#!/jonleighton/status/142021813415841794 | |||||
* | call to_s on value passed to table_name= | Sergey Nartimov | 2012-01-26 | 2 | -1/+6 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | 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. |