aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8418 from ershad/masterCarlos Antonio da Silva2012-12-041-1/+1
|\
| * Fixing a couple of spelling mistakesErshad K2012-12-041-1/+1
|/
* Merge pull request #8417 from kennyj/fix_8414Rafael Mendonça França2012-12-042-3/+8
|\
| * Fix #8414. Performance problem with postgresql adapter primary_key function.kennyj2012-12-052-3/+8
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-0439-392/+435
|\ \
| * | copy edits [ci skip]Vijay Dev2012-12-044-27/+18
| * | Revert "Add documentation to TransactionIsolationError [ci skip]"Vijay Dev2012-12-041-2/+0
| * | Fix a typo in ActionController::CachingJean Boussier2012-12-031-2/+1
| * | fix some formatting13342012-12-031-2/+2
| * | Fix typo.Hendy Tanata2012-12-031-2/+2
| * | grammar improvements for increment_counter and decrement_counter docsMatthew Robertson2012-12-021-6/+8
| * | increment_counter and decrement_counter can accept and array of ids as an argMatthew Robertson2012-12-021-2/+2
| * | added full file path in all file referencesYoni Yalovitsky2012-12-031-9/+9
| * | removed an extra slash before the 'app' dirYoni Yalovitsky2012-12-031-1/+1
| * | Standardize use of "route globbing" and "wildcard segments" [ci skip]Pablo Torres2012-12-021-3/+3
| * | Add counterexample for regex [ci skip]Pablo Torres2012-12-021-1/+1
| * | Convert parragraph about security to a NOTE [ci skip]Pablo Torres2012-12-021-1/+1
| * | Add clarity to static segments docs in non-resourceful routes [ci skip]Pablo Torres2012-12-021-1/+1
| * | Correct grammar [ci skip]Pablo Torres2012-12-021-3/+3
| * | Convert a section to a tip to highlight it [ci skip]Pablo Torres2012-12-021-3/+1
| * | Normalize use of colon before code examples in routing guide [ci skip]Pablo Torres2012-12-021-32/+32
| * | Show equivalent routes definition without using concerns [ci skip]Pablo Torres2012-12-021-0/+13
| * | Clarify section titles [ci skip]Pablo Torres2012-12-021-2/+2
| * | Move note to a meaningful section in the guides [ci skip]Pablo Torres2012-12-021-2/+2
| * | Use correct conjunction and connector words [ci skip]Pablo Torres2012-12-021-3/+5
| * | match text with translation file exampleChris Walquist2012-12-021-1/+1
| * | Capitalize all table column titles in routing guidePablo Torres2012-12-021-8/+8
| * | List instructions in the order to be executedPablo Torres2012-12-021-3/+1
| * | Add shallow nesting to the routing guidePablo Torres2012-12-021-0/+85
| * | Remove nodoc from FlashHash #[]= [ci skip]Pablo Torres2012-12-011-1/+1
| * | Cleans and removes 'Examples' tag [ci skip]Alvaro Pereyra2012-12-016-13/+4
| * | Cleans and removes useless 'Examples' tag [ci skip]Alvaro Pereyra2012-12-018-71/+46
| * | nodoc AS::Testing::ConstantLookup::ClassMethods [ci skip]Carlos Duclos2012-12-011-1/+1
| * | Add documentation for Hash.from_xml [ci skip]HPNeo2012-12-011-0/+13
| * | Add documentation to AssetTagHelper#image_alt [ci skip]Florent Guilleux2012-12-011-0/+3
| * | update AR::Schema docs [ci skip]Carlos Duclos2012-12-011-1/+6
| * | Fixes wrong typo on FormHelper [ci skip]Alvaro Pereyra2012-12-011-1/+1
| * | Cleans documentation from Helpers [ci skip]Alvaro Pereyra2012-12-015-121/+98
| * | Revert "Remove trailing whitespaces"Florent Guilleux2012-12-0128-59/+61
| * | Remove trailing whitespacesFlorent Guilleux2012-12-0128-61/+59
| * | Add documentation to TransactionIsolationError [ci skip]Florent Guilleux2012-12-011-0/+2
| * | Improves documentation of Capture helper [ci skip]Alvaro Pereyra2012-12-012-14/+13
| * | Removes :nodoc: tag on AtomFeedHelper [ci skip]Alvaro Pereyra2012-12-011-3/+3
| * | Removes unneeded 'Example' tags and whitespaces [ci skip]Alvaro Pereyra2012-12-011-45/+42
| * | nodoc AD & AV railties classesCarlos Duclos2012-12-012-2/+2
| * | Remove :nodoc from SanitizeHelper module [ci skip]HPNeo2012-12-011-1/+1
| * | nodoc AS::Testing::Pending because is deprecated [ci skip]Carlos Duclos2012-12-011-2/+2
| * | Removes :nodoc: label [ci skip]Alvaro Pereyra2012-12-011-1/+1
| * | Improves documentation on favicon_link_tagAlvaro Pereyra2012-12-011-14/+16
| * | remove unneeded Examples tag [ci skip]Carlos Duclos2012-12-011-10/+0