Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into desc_tracker | Rolf Timmermans | 2011-03-27 | 137 | -788/+2315 |
|\ | |||||
| * | cleaning up typecast test a little | Aaron Patterson | 2011-03-26 | 1 | -6/+8 |
| | | |||||
| * | refactoring tz to a variable rather than repeating it | Aaron Patterson | 2011-03-26 | 1 | -2/+4 |
| | | |||||
| * | Allow FormHelper#form_for to specify the :method as a direct option instead ↵ | David Heinemeier Hansson | 2011-03-26 | 3 | -4/+36 |
| | | | | | | | | of through the :html hash [DHH] | ||||
| * | adding a test for attributes after type cast. thanks nragaz. :heart: | Aaron Patterson | 2011-03-26 | 1 | -0/+17 |
| | | |||||
| * | Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() ↵ | David Heinemeier Hansson | 2011-03-26 | 2 | -0/+7 |
| | | | | | | | | -- note this then supersedes the Object#j() method that the JSON gem adds within templates using the JavaScriptHelper [DHH] | ||||
| * | Removed #update_attribute method. New #update_column method. | Sebastian Martinez | 2011-03-26 | 13 | -80/+78 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-26 | 1 | -3/+3 |
| |\ | |||||
| | * | impact recent updates to #first! and #last! methods | Sebastian Martinez | 2011-03-25 | 1 | -3/+3 |
| | | | |||||
| * | | removes unnecessary selfs, and mentions that first! and last! take no ↵ | Xavier Noria | 2011-03-26 | 1 | -4/+6 |
| |/ | | | | | | | arguments in their API docs | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-25 | 1 | -0/+34 |
| |\ | |||||
| | * | Update AR querying guide with #first! and #last! new methods | Sebastian Martinez | 2011-03-25 | 1 | -0/+34 |
| | | | |||||
| * | | No arguments for first! and last! | Pratik Naik | 2011-03-25 | 1 | -4/+4 |
| | | | |||||
| * | | comment typo fix | Josh Susser | 2011-03-25 | 1 | -2/+2 |
| | | | |||||
| * | | fixing whitespace errors. :bomb: | Aaron Patterson | 2011-03-25 | 1 | -2/+2 |
| | | | |||||
| * | | correction to the outputted controller name in the diagnostics error ↵ | Josh Kalderimis | 2011-03-24 | 2 | -1/+17 |
| | | | | | | | | | | | | | | | | | | template, test included Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | add #first! and #last! to models & relations | Josh Susser | 2011-03-24 | 2 | -0/+34 |
| | | | |||||
| * | | Fix filter :only and :except with implicit actions | Andrew White | 2011-03-23 | 2 | -12/+17 |
| | | | | | | | | | | | | | | | | | | | | | The method_name argument is "default_render" for implicit actions so use the action_name attribute to determine which callbacks to run. [#5673 state:resolved] | ||||
| * | | Add a failing test case for an implicit action with a before filter. | Manfred Stienstra | 2011-03-23 | 3 | -0/+24 |
| | | | | | | | | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
| * | | Fix before_type_cast for timezone aware attributes by caching converted ↵ | Adam Meehan | 2011-03-23 | 2 | -19/+16 |
| | | | | | | | | | | | | value on write. Also remove read method reload arg on timezone attributes. | ||||
| * | | Make clearing of HABTM join table contents happen in an after_destory callback. | Murray Steele | 2011-03-23 | 1 | -12/+12 |
| | | | | | | | | | | | | The old method of redefining destroy meant that clearing the HABTM join table would happen as long as the call to destroy succeeded. Which meant if there was a before_destroy that stopped the instance being destroyed using normal means (returning false, raising ActiveRecord::Rollback) rather than exceptional means the join table would be cleared even though the instance wasn't destroyed. Doing it in an after_destroy hook avoids this and has the advantage of happening inside the DB transaction too. | ||||
| * | | Failing test case to show that habtm join table contents are removed when a ↵ | Murray Steele | 2011-03-23 | 1 | -0/+34 |
| |/ | | | | | | | model is destroyed but the destruction is blocked by a before_destroy. | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-23 | 8 | -7/+36 |
| |\ | |||||
| | * | Update 'Getting Started on Windows' tip to go to one-click Rails Installer | Dr Nic Williams | 2011-03-22 | 1 | -1/+1 |
| | | | |||||
| | * | Caching guide: Capitalize 'Note' so that it's rendered as a proper note | Ryan Bigg | 2011-03-23 | 1 | -1/+1 |
| | | | |||||
| | * | Querying guide: mention that performing a where on an relation that contains ↵ | Ryan Bigg | 2011-03-22 | 1 | -1/+3 |
| | | | | | | | | | | | | an includes statement will generate a LEFT OUTER JOIN rather than an INNER JOIN or another query | ||||
| | * | Querying guide: mention that performing a where on an relation that contains ↵ | Ryan Bigg | 2011-03-22 | 1 | -0/+14 |
| | | | | | | | | | | | | an includes statement will generate a LEFT OUTER JOIN rather than an INNER JOIN or another query | ||||
| | * | Beef up Rails::Railtie::Configuration docs | Gabriel Horner | 2011-03-19 | 1 | -0/+8 |
| | | | |||||
| | * | remove bank line | Paco Guzman | 2011-03-18 | 1 | -1/+0 |
| | | | |||||
| | * | Add link to mailing-list | Nicolas Cavigneaux | 2011-03-16 | 1 | -1/+1 |
| | | | |||||
| | * | Remove incorrect comment that a default value of NULL cannot be set with ↵ | Manuel Meurer | 2011-03-16 | 1 | -3/+2 |
| | | | | | | | | | | | | change_column_default. | ||||
| | * | doc :anchor option for #match in routes | Gabriel Horner | 2011-03-15 | 1 | -0/+7 |
| | | | |||||
| * | | Fix test for prepend giving a false positive. [#5716 state:resolved] | Aditya Sanghi | 2011-03-23 | 2 | -3/+2 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | parse dates to yaml in json arrays | Diego Carrion | 2011-03-22 | 2 | -2/+4 |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | test json decoding with time parsing disabled with all backends and respect ↵ | Diego Carrion | 2011-03-22 | 2 | -7/+7 |
| | | | | | | | | | | | | | | | | | | ActiveSupport.parse_json_times when converting to yaml Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | use class_eval with a string when it's possible | Santiago Pastorino | 2011-03-22 | 3 | -7/+21 |
| | | | |||||
| * | | Allow to read and write AR attributes with non valid identifiers | Santiago Pastorino | 2011-03-22 | 4 | -2/+22 |
| | | | |||||
| * | | Do not in place modify what table_name returns | Santiago Pastorino | 2011-03-22 | 3 | -13/+2 |
| | | | |||||
| * | | Install rb-fsevent gem if ENV[RB_FSEVENT] is set | Piotr Sarnacki | 2011-03-22 | 1 | -0/+3 |
| | | | |||||
| * | | adding missing require | Aaron Patterson | 2011-03-22 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into fuuu | Aaron Patterson | 2011-03-22 | 20 | -45/+256 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Do not show optional (.:format) block for wildcard route [#6605 state:resolved] pushing id insertion and prefetch primary keys down to Relation#insert use prepared statements to fetch the last insert id escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#6559 state:resolved] schemas set by set_table_name are respected by the mysql adapter. [#5322 state:resolved] Reapply extensions when using except and only SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test Improved resolver docs a bit [action_view] docs for FileSystemResolver [action_view] added custom patterns to template resolver | ||||
| | * | | Do not show optional (.:format) block for wildcard route [#6605 state:resolved] | Prem Sichanugrist | 2011-03-22 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | This will make the output of `rake routes` to be correctly match to the behavior of the application, as the regular expression used to match the path is greedy and won't capture the format part by default | ||||
| | * | | pushing id insertion and prefetch primary keys down to Relation#insert | Aaron Patterson | 2011-03-22 | 4 | -12/+23 |
| | | | | |||||
| | * | | use prepared statements to fetch the last insert id | Aaron Patterson | 2011-03-21 | 1 | -3/+4 |
| | | | | |||||
| | * | | escaping binary data encoding when inserting to sqlite3. Thanks Naruse! ↵ | Aaron Patterson | 2011-03-21 | 2 | -0/+27 |
| | | | | | | | | | | | | | | | | [#6559 state:resolved] | ||||
| | * | | schemas set by set_table_name are respected by the mysql adapter. [#5322 ↵ | Aaron Patterson | 2011-03-21 | 2 | -2/+52 |
| | | | | | | | | | | | | | | | | state:resolved] | ||||
| | * | | Reapply extensions when using except and only | Iain Hecker | 2011-03-21 | 2 | -0/+14 |
| | | | | |||||
| | * | | SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test | Aaron Patterson | 2011-03-21 | 1 | -2/+2 |
| | | | | |||||
| | * | | Improved resolver docs a bit | José Valim | 2011-03-19 | 1 | -2/+10 |
| | | | | |||||
| | * | | [action_view] docs for FileSystemResolver | Chris Kowalik | 2011-03-20 | 1 | -2/+30 |
| | | | |