aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Do not show optional (.:format) block for wildcard route [#6605 state:resolved]Prem Sichanugrist2011-03-222-1/+8
| * 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! [#655...Aaron Patterson2011-03-212-0/+27
| * schemas set by set_table_name are respected by the mysql adapter. [#5322 stat...Aaron Patterson2011-03-212-2/+52
| * 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
| * 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 an...Jon Leighton2011-03-182-14/+14
* | 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 tha...Josh Kalderimis2011-03-162-2/+4
| * Fix typo in assertion messageAndrew White2011-03-161-1/+1
| * Add messages to plain assertions.Norman Clarke2011-03-151-2/+2
| * 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
| | * Adjust unique constraint comment to include info about the RecordNotUnique ex...Anders Elfving2011-03-131-4/+11
| | * Change ActionView::ViewPathSet to ActionView::PathSetManuel Meurer2011-03-131-4/+4
| | * Removed double textsLars Smit2011-03-131-13/+0
| | * remove some blanksPaco Guzman2011-03-112-4/+4
| | * Minor formatting changes and remove a commentMike Gehard2011-03-101-6/+7
| | * update plugin urls to reflect official maintainersVijay Dev2011-03-104-5/+5
| | * Added note re: functional tests and HTTP methods.David Aaron Fendley2011-03-091-0/+2
| | * expose ActionMailer::MailHelper in the RDocDiego Carrion2011-03-091-0/+1
| | * Add a note to discourage users from using presence validators with allow_(nil...Jeff Kreeftmeijer2011-03-091-1/+3
| * | silence @dummy_path not defined warningsJack Dempsey2011-03-141-0/+1
| * | use parens and silence ambiguous args warningsJack Dempsey2011-03-142-18/+18
| * | Remove invalid testAndrew White2011-03-131-5/+1
| * | Revert "It should be possible to use ActiveSupport::DescendantTracker without...José Valim2011-03-131-9/+7
| * | Refactor length validationSantiago Pastorino2011-03-122-6/+6
| * | length validation for fixnumsAndriy Tyurnikov2011-03-122-1/+13
| * | Fixed a bug when empty? was called on a grouped Relation that wasn't loadedChris Oliver2011-03-122-1/+34
| * | Prevent callbacks in child classes from being executed more than once.Rolf Timmermans2011-03-132-1/+31
| * | It should be possible to use ActiveSupport::DescendantTracker without getting...Rolf Timmermans2011-03-131-7/+9