Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8830 from antoinelyset/master | Xavier Noria | 2013-01-28 | 1 | -0/+2 |
|\ | | | | | Improve String#squish whitespaces matching | ||||
| * | Improve String#squish whitespaces matching | Antoine Lyset | 2013-01-22 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'docrails/master' | Xavier Noria | 2013-01-26 | 14 | -37/+92 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb guides/code/getting_started/app/controllers/comments_controller.rb | ||||
| * | | generic pass before merging docrails | Xavier Noria | 2013-01-26 | 1 | -1/+1 |
| | | | |||||
| * | | Remove mass-assignment line from guide summary | Andrew Wilcox | 2013-01-25 | 1 | -1/+0 |
| | | | |||||
| * | | fix Active Record/Action Pack Changelog links | Juanjo Bazán | 2013-01-25 | 1 | -2/+2 |
| | | | |||||
| * | | [engines guide] reformatted some stuff | Weston Platter | 2013-01-24 | 1 | -3/+3 |
| | | | |||||
| * | | [engines guide] reworded a run on | Weston Platter | 2013-01-24 | 1 | -3/+2 |
| | | | |||||
| * | | Add new DB rake tasks to the contributing section. | Vipul A M | 2013-01-23 | 1 | -0/+14 |
| | | | |||||
| * | | Typo, grammar, and comma love. | Brian Littmann | 2013-01-22 | 1 | -4/+4 |
| | | | |||||
| * | | Typo fix in guides/source/engines.md | Brian Littmann | 2013-01-22 | 1 | -1/+1 |
| | | | |||||
| * | | consistently inherit from ApplicationController in guides exemples | Cyril Jouve | 2013-01-20 | 3 | -4/+4 |
| | | | |||||
| * | | Replacing plugin to gem | Lucas Caton | 2013-01-19 | 1 | -2/+2 |
| | | | |||||
| * | | Replaced documentation for ↵ | Thomas Drake-Brockman | 2013-01-20 | 1 | -1/+1 |
| | | | | | | | | | | | | config.action_controller.raise_on_unpermitted_parameters with documentation for config.action_controller.action_on_unpermitted_params. | ||||
| * | | "Asynchronous Mailers" will not be available in 4.0 | Akira Matsuda | 2013-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | for recommended Apache configuration of asset pipeline, use <Location> ↵ | Erik Johnson | 2013-01-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | instead of <LocationMatch>, to avoid unnecessary reg ex parsing and code <http://httpd.apache.org/docs/2.2/mod/core.html#location (recommended by @jja). - @erikj | ||||
| * | | clarify awkward sentence re: email testing | Jonathan Garvin | 2013-01-16 | 1 | -1/+1 |
| | | | |||||
| * | | Fix formatting error introduced in cc585c8. | Nicholas Schultz-Møller | 2013-01-16 | 1 | -1/+2 |
| | | | |||||
| * | | removes spurious file pushed in cc585c8 | Xavier Noria | 2013-01-15 | 1 | -349/+0 |
| | | | |||||
| * | | revert to 814c9875ec4cf01e1348d1ab1c9d12eee5a9adac | davetoxa | 2013-01-16 | 2 | -0/+393 |
| | | | |||||
| * | | Revert "Improves documentation about Fragment Caching. [ci skip]" | davetoxa | 2013-01-16 | 1 | -47/+0 |
| | | | | | | | | | | | | This reverts commit 814c9875ec4cf01e1348d1ab1c9d12eee5a9adac. | ||||
| * | | Improves documentation about Fragment Caching. [ci skip] | Nicholas Schultz-Møller | 2013-01-15 | 1 | -0/+47 |
| | | | | | | | | | | | | | | | | | | Adds documentation for: - Aggregate cache keys, - using an ActiveRecord model as cache key and - Russian Doll Caching. | ||||
| * | | Fix simple expression | Jude Arasu | 2013-01-13 | 1 | -1/+1 |
| | | | |||||
| * | | Fix typo in guides/source/engines.md | Zachary Porter | 2013-01-11 | 1 | -1/+1 |
| | | | |||||
| * | | Fix typo in guides/source/engines.md | Zachary Porter | 2013-01-11 | 1 | -1/+1 |
| | | | |||||
| * | | Update engine application layout file path | Zachary Porter | 2013-01-11 | 1 | -1/+1 |
| | | | |||||
| * | | Update guides/source/active_record_basics.md | Benoit Caccinolo | 2013-01-11 | 1 | -1/+1 |
| | | | |||||
| * | | update assets guide code styling | Gosha Arinich | 2013-01-10 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | * 1.9 hash syntax * proper formatting around one line blocks * do-end for multiline blocks | ||||
| * | | remove 'update' duplications | Juanjo Bazán | 2013-01-08 | 2 | -2/+0 |
| | | | |||||
* | | | Merge pull request #9084 from senny/document_am_delivieries_reset | José Valim | 2013-01-26 | 1 | -0/+2 |
|\ \ \ | |_|/ |/| | | document the behavior of `ActionMailer::Base.delivieries` in tests | ||||
| * | | document the behavior of `ActionMailer::Base.delivieries` in tests | Yves Senn | 2013-01-26 | 1 | -0/+2 |
| | | | | | | | | | | | | thanks @danielpuglisi | ||||
* | | | Merge pull request #9031 from virusman/doc-no-asset-concat | Guillermo Iguaran | 2013-01-22 | 2 | -125/+0 |
|\ \ \ | | | | | | | | | Remove old asset tags API from docs | ||||
| * | | | Remove old asset tags API from docs, reflecting changes from #7900 | virusman | 2013-01-23 | 2 | -125/+0 |
| | | | | |||||
* | | | | Revert "updating i18n guide with locale config location." | Carlos Antonio da Silva | 2013-01-22 | 1 | -1/+1 |
|/ / / | | | | | | | | | | This reverts commit 46902908910c041e268429d674bbe084399cc664. | ||||
* | | | fixing link to validations guide in getting started guide | Steve Klabnik | 2013-01-22 | 1 | -4/+5 |
| | | | |||||
* | | | Getting Started Guide: strong_parameters | Steve Klabnik | 2013-01-22 | 1 | -8/+33 |
| | | | | | | | | | | | | | | | Stuff didn't work because of strong_parameters. Now the right calls are in place. | ||||
* | | | copy-edits 7e6e4f2 [ci skip] | Xavier Noria | 2013-01-21 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | Capitalization in the title of the section, enumerates the environments in the usual order, adds a paragraph, and tries to use less "you"s. | ||||
* | | | document how to create custom rails environments | Yves Senn | 2013-01-21 | 2 | -1/+8 |
| | | | |||||
* | | | s/it's/its/ | Akira Matsuda | 2013-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | script => bin | Akira Matsuda | 2013-01-18 | 1 | -1/+1 |
| | | | |||||
* | | | spelling correction for AM interceptors | Yves Senn | 2013-01-17 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #8964 from mattdbridges/specify-log-to-clear | Carlos Antonio da Silva | 2013-01-16 | 1 | -1/+1 |
|\ \ | | | | | | | Clear specific logs when using `rake log:clear` | ||||
| * | | clear specific logs when using rake log:clear | Matt Bridges | 2013-01-16 | 1 | -1/+1 |
| | | | |||||
* | | | document Intercepters in ActionMailer guide | Yves Senn | 2013-01-16 | 1 | -0/+20 |
|/ / | |||||
* | | Update guides/source/active_record_validations.md | Anton Cherepanov | 2013-01-15 | 1 | -1/+0 |
| | | | | | | Duplicated `update` | ||||
* | | Remove WIP from Working With JavaScript Guide. | Steve Klabnik | 2013-01-13 | 1 | -1/+0 |
| | | | | | | | | Now that we've fixed the fibs example, this is good to go. | ||||
* | | Merge pull request #8869 from goshakkk/guides-asset-pipeline-tilt | Guillermo Iguaran | 2013-01-10 | 1 | -1/+25 |
|\ \ | | | | | | | Add asset pipeline guides section on implementing & registering own engines | ||||
| * | | add asset pipeline guides section on implementing & registering own engines | Gosha Arinich | 2013-01-10 | 1 | -1/+25 |
| | | | |||||
* | | | mention performance test extraction in 4.0 guide | Yves Senn | 2013-01-10 | 1 | -0/+1 |
| | | | |||||
* | | | remove the rails guide on performance testing | Yves Senn | 2013-01-10 | 2 | -680/+0 |
| | | |