aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into desc_trackerRolf Timmermans2011-03-27137-788/+2315
|\
| * cleaning up typecast test a littleAaron Patterson2011-03-261-6/+8
| |
| * refactoring tz to a variable rather than repeating itAaron Patterson2011-03-261-2/+4
| |
| * Allow FormHelper#form_for to specify the :method as a direct option instead ↵David Heinemeier Hansson2011-03-263-4/+36
| | | | | | | | of through the :html hash [DHH]
| * adding a test for attributes after type cast. thanks nragaz. :heart:Aaron Patterson2011-03-261-0/+17
| |
| * Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() ↵David Heinemeier Hansson2011-03-262-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 Martinez2011-03-2613-80/+78
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-261-3/+3
| |\
| | * impact recent updates to #first! and #last! methodsSebastian Martinez2011-03-251-3/+3
| | |
| * | removes unnecessary selfs, and mentions that first! and last! take no ↵Xavier Noria2011-03-261-4/+6
| |/ | | | | | | arguments in their API docs
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-251-0/+34
| |\
| | * Update AR querying guide with #first! and #last! new methodsSebastian Martinez2011-03-251-0/+34
| | |
| * | No arguments for first! and last!Pratik Naik2011-03-251-4/+4
| | |
| * | comment typo fixJosh Susser2011-03-251-2/+2
| | |
| * | fixing whitespace errors. :bomb:Aaron Patterson2011-03-251-2/+2
| | |
| * | correction to the outputted controller name in the diagnostics error ↵Josh Kalderimis2011-03-242-1/+17
| | | | | | | | | | | | | | | | | | template, test included Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | add #first! and #last! to models & relationsJosh Susser2011-03-242-0/+34
| | |
| * | Fix filter :only and :except with implicit actionsAndrew White2011-03-232-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 Stienstra2011-03-233-0/+24
| | | | | | | | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
| * | Fix before_type_cast for timezone aware attributes by caching converted ↵Adam Meehan2011-03-232-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 Steele2011-03-231-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 Steele2011-03-231-0/+34
| |/ | | | | | | model is destroyed but the destruction is blocked by a before_destroy.
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-238-7/+36
| |\
| | * Update 'Getting Started on Windows' tip to go to one-click Rails InstallerDr Nic Williams2011-03-221-1/+1
| | |
| | * Caching guide: Capitalize 'Note' so that it's rendered as a proper noteRyan Bigg2011-03-231-1/+1
| | |
| | * Querying guide: mention that performing a where on an relation that contains ↵Ryan Bigg2011-03-221-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 Bigg2011-03-221-0/+14
| | | | | | | | | | | | an includes statement will generate a LEFT OUTER JOIN rather than an INNER JOIN or another query
| | * Beef up Rails::Railtie::Configuration docsGabriel Horner2011-03-191-0/+8
| | |
| | * remove bank linePaco Guzman2011-03-181-1/+0
| | |
| | * Add link to mailing-listNicolas Cavigneaux2011-03-161-1/+1
| | |
| | * Remove incorrect comment that a default value of NULL cannot be set with ↵Manuel Meurer2011-03-161-3/+2
| | | | | | | | | | | | change_column_default.
| | * doc :anchor option for #match in routesGabriel Horner2011-03-151-0/+7
| | |
| * | Fix test for prepend giving a false positive. [#5716 state:resolved]Aditya Sanghi2011-03-232-3/+2
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * | parse dates to yaml in json arraysDiego Carrion2011-03-222-2/+4
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | test json decoding with time parsing disabled with all backends and respect ↵Diego Carrion2011-03-222-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 possibleSantiago Pastorino2011-03-223-7/+21
| | |
| * | Allow to read and write AR attributes with non valid identifiersSantiago Pastorino2011-03-224-2/+22
| | |
| * | Do not in place modify what table_name returnsSantiago Pastorino2011-03-223-13/+2
| | |
| * | Install rb-fsevent gem if ENV[RB_FSEVENT] is setPiotr Sarnacki2011-03-221-0/+3
| | |
| * | adding missing requireAaron Patterson2011-03-221-0/+1
| | |
| * | Merge branch 'master' into fuuuAaron Patterson2011-03-2220-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 Sichanugrist2011-03-222-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#insertAaron Patterson2011-03-224-12/+23
| | | |
| | * | use prepared statements to fetch the last insert idAaron Patterson2011-03-211-3/+4
| | | |
| | * | escaping binary data encoding when inserting to sqlite3. Thanks Naruse! ↵Aaron Patterson2011-03-212-0/+27
| | | | | | | | | | | | | | | | [#6559 state:resolved]
| | * | schemas set by set_table_name are respected by the mysql adapter. [#5322 ↵Aaron Patterson2011-03-212-2/+52
| | | | | | | | | | | | | | | | state:resolved]
| | * | Reapply extensions when using except and onlyIain Hecker2011-03-212-0/+14
| | | |
| | * | SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this testAaron Patterson2011-03-211-2/+2
| | | |
| | * | Improved resolver docs a bitJosé Valim2011-03-191-2/+10
| | | |
| | * | [action_view] docs for FileSystemResolverChris Kowalik2011-03-201-2/+30
| | | |