aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | [action_view] added custom patterns to template resolverChris Kowalik2011-03-206-24/+89
| | |
* | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-182-8/+69
|\| |
| * | define_attr_method should be able to define methods that returns nilSantiago Pastorino2011-03-172-2/+4
| | |
| * | remove misleading commentAaron Patterson2011-03-171-2/+0
| | |
| * | dup strings on return so that in place modifications do not break anything. ↵Aaron Patterson2011-03-172-1/+12
| | | | | | | | | | | | I am looking at you "compute_table_name"
| * | define_attr_method correctly defines methods with invalid identifiersSantiago Pastorino2011-03-162-5/+6
| | |
| * | Add a define_attr_method testSantiago Pastorino2011-03-161-0/+13
| | |
| * | Add test for define_attr_method using as name an invalid identifierSantiago Pastorino2011-03-161-0/+13
| | |
| * | Add test for define_attribute_method using as name an invalid identifierSantiago Pastorino2011-03-161-3/+26
| | |
* | | Add order clauses to fix some tests which were failing under 1.8 on oracle ↵Jon Leighton2011-03-182-14/+14
| | | | | | | | | | | | and postgres
* | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-1630-81/+164
|\| |
| * | fixes an issue with number_to_human when converting values which are less ↵Josh Kalderimis2011-03-162-2/+4
| | | | | | | | | | | | | | | | | | than 1 but greater than -1 [#6576 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Fix typo in assertion messageAndrew White2011-03-161-1/+1
| | |
| * | Add messages to plain assertions.Norman Clarke2011-03-151-2/+2
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | use a list to represent the supported verbs for a route objectAaron Patterson2011-03-142-11/+13
| | |
| * | stop splatting arguments so that we can understand wtf is going onAaron Patterson2011-03-141-2/+3
| | |
| * | RegexpWithNamedGroups is only used for path_info, so only apply to path infoAaron Patterson2011-03-141-1/+2
| |/
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-1412-38/+40
| |\
| | * be be -> beXavier Noria2011-03-141-1/+1
| | |
| | * move the tips about :allow_(nil|blank) near their explanations, also no need ↵Xavier Noria2011-03-141-3/+5
| | | | | | | | | | | | to say these are options for all validators if they are not
| | * Adjust unique constraint comment to include info about the RecordNotUnique ↵Anders Elfving2011-03-131-4/+11
| | | | | | | | | | | | exception
| | * Change ActionView::ViewPathSet to ActionView::PathSetManuel Meurer2011-03-131-4/+4
| | |