aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Inline the prefix assignment so it doesnt look so daftDavid Heinemeier Hansson2012-01-271-2/+1
|
* Revert "Fix expanding cache key for single element arrays"David Heinemeier Hansson2012-01-272-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é Valim2012-01-273-5/+18
|\ | | | | | | 'cantonio/checkbox-hidden-backport' into 3-2-stable
| * don't set the hidden checkbox value if it's nilDamien Mathieu2012-01-272-1/+9
| |
| * check_box helper with :disabled => true generates disabled hidden field. ↵Tadas Tamošauskas2012-01-273-5/+8
|/ | | | fixes #1953
* Merge pull request #4715 from pwim/find-create-multi-argsJon Leighton2012-01-272-1/+12
| | | | Fix regression from Rails 3.1
* fixes whitespace in CHANGELOG entriesXavier Noria2012-01-263-3/+3
|
* updating RAILS_VERSIONXavier Noria2012-01-269-9/+9
|
* CHANGELOG revision for v3.2.1Xavier Noria2012-01-267-2/+50
|
* Revert usage of safe constantizeJosé Valim2012-01-261-1/+3
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* safe_constantize should handle wrong constant name NameErrors Fixes #4710Alex Tambellini2012-01-262-3/+4
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* bumping journey to 1.0.1Aaron Patterson2012-01-261-1/+1
|
* Merge pull request #4696 from rafaelfranca/issue-4653Aaron Patterson2012-01-261-2/+0
|\ | | | | Remove extra attributes from HABTM join tables in AR tests
| * Remove extra attributes from HABTM join tables in AR testsRafael Mendonça França2012-01-261-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 #4703Aaron Patterson2012-01-262-1/+8
| |
* | registers 2483460 in the CHANGELOGXavier Noria2012-01-261-3/+5
| |
* | disable automatic explain if there is no logger [closes #4671]Xavier Noria2012-01-263-1/+20
|/
* Fix contributing guide to reflect preferred position on indentationbrainopia2012-01-261-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 Nartimov2012-01-262-1/+6
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge pull request #4675 from lunks/3-2-stableAaron Patterson2012-01-251-1/+1
|\ | | | | Duping log handler on buffered logger silencer.
| * Duping log handler. fixes #4668Pedro Nascimento2012-01-251-1/+1
| |
* | Merge pull request #4673 from carlosantoniodasilva/validation-guides-update-3-2Vijay Dev2012-01-256-25/+34
|\ \ | |/ |/| Validation guides update 3 2
| * Fix callbacks order for destroying an object in validations guideCarlos Antonio da Silva2012-01-251-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 guideCarlos Antonio da Silva2012-01-251-7/+2
| |
| * Change ActiveRecord::Errors to ActiveModel::Errors in guidesCarlos Antonio da Silva2012-01-256-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 guideCarlos Antonio da Silva2012-01-251-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 Arondekar2012-01-261-1/+1
| |
* | example bracket errorDamian Le Nouaille2012-01-261-1/+1
| |
* | Merge pull request #4658 from pwim/unicode-pathsAaron Patterson2012-01-251-0/+20
|\ \ | | | | | | Test for unicode path support
| * | Test for unicode path supportPaul McMahon2012-01-251-0/+20
| | | | | | | | | | | | This is currently broken due to a bug in journey.
* | | Merge pull request #4654 from pwim/explicit-deprecation-requireJosé Valim2012-01-241-1/+1
|\ \ \ | |/ / |/| | Explicit deprecation require
| * | allow requiring of 'active_model/naming'Paul McMahon2012-01-251-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-fixAaron Patterson2012-01-242-1/+13
|\ \ \ | | | | | | | | datetime_select fix for dates of -infinity and +infinity
| * | | datetime_select should work with -/+ infinity datesJoe Van Dyk2012-01-242-1/+13
| | | |
* | | | Merge pull request #4643 from rafaelfranca/3-2-stableJosé Valim2012-01-241-3/+0
|\ \ \ \ | | | | | | | | | | Remove unused variables to avoid warnings
| * | | | Remove unused variables to avoid warningsRafael Mendonça França2012-01-241-3/+0
|/ / / /
* | | | Merge pull request #4641 from rafaelfranca/date_select-fix-3-2José Valim2012-01-242-4/+41
|\ \ \ \ | | | | | | | | | | date_select fixes [3-2-stable]
| * | | | Fix date_select with discard_month and discard_year optionsRafael Mendonça França2012-01-242-2/+39
| | | | | | | | | | | | | | | | | | | | Closes #4553 and #4633
| * | | | Fix date_select nil and blank and order caseIndrek Juhkam2012-01-242-18/+2
| | | | |
| * | | | Add failing test for date_selectIndrek Juhkam2012-01-241-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_offetsAaron Patterson2012-01-241-1/+1
|/ / / | | | | | | | | | Update time zone offset information
* | | Fix GH #4344. A defined callback in extended module is called too.kennyj2012-01-242-5/+62
| | | | | | | | | | | | | | | | | | Conflicts: activesupport/test/callbacks_test.rb
* | | work against 1-0-stable until a new journey is releasedAaron Patterson2012-01-231-1/+1
| | |
* | | Added custom regexps to ASTs that have literal nodes on either side ofAaron Patterson2012-01-232-1/+82
| | | | | | | | | | | | symbol nodes. Fixes #4585
* | | Merge pull request #4601 from carlosantoniodasilva/patch-1José Valim2012-01-231-0/+1
|\ \ \ | | | | | | | | Add missing require to Array#wrap in generators action methods
| * | | Add missing require to Array#wrap in generators action methodsCarlos Antonio da Silva2012-01-221-0/+1
| | | |
* | | | test base64 encode and decodeVijay Dev2012-01-231-0/+9
| | | |
* | | | Merge pull request #4611 from jviney/3-2-stableVijay Dev2012-01-231-1/+1
|\ \ \ \ | | | | | | | | | | Fix ActiveSupport::Base64.decode64
| * | | | The deprecated ActiveSupport::Base64.decode64 method should call ↵Jonathan Viney2012-01-231-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é Valim2012-01-222-5/+5
| | | | | | | | | | | | | | | | bash, zsh, etc, closes #4602
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:39:11 +0000