aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Do not try to call `column_names` on the abstract class.Prem Sichanugrist2011-05-152-2/+15
* These extra array operations appear to be unnecessary. Reasoning:Jon Leighton2011-05-141-8/+2
* CollectionAssociation#merge_target_lists should write to the underlying attri...Jon Leighton2011-05-144-5/+17
* An attempt to make CollectionAssociation#merge_target_lists make more sense.Jon Leighton2011-05-141-16/+35
* Added some docs to controller runtime.José Valim2011-05-141-1/+4
* Merge pull request #554 from tomafro/reset-activerecord-runtime-before-each-r...José Valim2011-05-142-1/+19
|\
| * Reset ActiveRecord::LogSubscriber runtime at the start of each requestTom Ward2011-05-142-0/+18
| * Escape regex in controller_runtime_test to actually check that the ActiveReco...Tom Ward2011-05-141-1/+1
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-1442-220/+319
|\
| * minor edits after going through what's new in docrailsXavier Noria2011-05-143-10/+13
| * [GUIDES] Changed the `LANGUAGE` variable to `GUIDES_LANGUAGE` to minimize con...Karel Minarik2011-05-141-4/+5
| * minor correctionsVijay Dev2011-05-141-5/+5
| * Link the API documentation to non-edge insteadPrem Sichanugrist2011-05-131-1/+1
| * Adding guide for wrapping JSON/XML parameters, which also links to the API do...Prem Sichanugrist2011-05-131-0/+26
| * Prefer topic branches instead of master branch for users contributionsGuillermo Iguaran2011-05-121-5/+8
| * added an example for AC::UrlFor usage to make usage simpler.Nick Sutterer2011-05-121-1/+13
| * added docs for AbC::UrlFor and AC::UrlFor.Nick Sutterer2011-05-122-0/+12
| * fix spellingsVijay Dev2011-05-112-2/+2
| * indentation fixesVijay Dev2011-05-111-24/+23
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-05-1111-92/+98
| |\
| | * fix bad encoding on contributing to RoR pageDan Pickett2011-05-101-1/+1
| | * Follow code conventions on docsSebastian Martinez2011-05-105-13/+13
| | * Fix styiling issues on DateHelper docsSebastian Martinez2011-05-101-64/+70
| | * Fix styiling issues on AtomFeedHelper docsSebastian Martinez2011-05-101-4/+4
| | * Remove extra whitespace.Sebastian Martinez2011-05-101-1/+1
| | * Fix styiling issue on TranslationHelper docsSebastian Martinez2011-05-101-4/+4
| | * Fix styiling issue on ActionView::Template docsSebastian Martinez2011-05-101-5/+5
| * | minor fix in assets usageVijay Dev2011-05-101-2/+2
| |/
| * typo fixTrent Ogren2011-05-101-1/+1
| * Explain the implication of using :ignore_date on time_selectAditya Sanghi2011-05-101-1/+2
| * :touch => :symbol also updates the updated_at attributeBruno Michel2011-05-101-1/+1
| * Missing an end in routing docsJames Miller2011-05-091-0/+1
| * more fixed-fonts hereSebastian Martinez2011-05-091-23/+23
| * added some fixed fontsSebastian Martinez2011-05-091-3/+3
| * fixes github fork urlVijay Dev2011-05-101-1/+1
| * Fixed typos in documentation for the date_select helper in actionpack/action_...Philip Roberts2011-05-091-1/+1
| * Merge pull request #42 from sgerrand/mastersgerrand2011-05-091-2/+2
| |\
| | * - Fixed typo in association parameters configuration (again)Sasha Gerrand2011-05-091-2/+2
| * | Merge pull request #41 from sgerrand/mastersgerrand2011-05-081-1/+1
| |\|
| | * - Fixed typo in the example of a self join on a modelSasha Gerrand2011-05-091-1/+1
| | * - Moved foreign key parameter to correct location for self join on a model ex...Sasha Gerrand2011-05-091-2/+2
| |/
| * Include examples for negative ordinalize in the guideVijay Dev2011-05-091-0/+2
| * improve comment in wrap_parameters templateVijay Dev2011-05-091-1/+1
| * included examples for negative ordinalizeVijay Dev2011-05-081-4/+7
| * Documentation fix. Corrected a copy/paste mistake for link_to_if documentation.Ryan Sandridge2011-05-081-1/+1
| * Fixed documentation of select tag; options with html need to pass through htm...Jason2011-05-081-6/+6
| * Included more details on Rails coding conventions (from LH Source Style page)Vijay Dev2011-05-081-4/+10
| * remove unnecessary use of 'Example'Vijay Dev2011-05-071-6/+0
| * replaced eg using old router api with the one in the guides. Add info on nest...Vijay Dev2011-05-071-5/+8
| * minor fixesVijay Dev2011-05-073-4/+3