Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'docrails/master' | Xavier Noria | 2013-01-26 | 26 | -49/+198 |
|\ | | | | | | | | | | | 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 | 5 | -423/+63 |
| | | |||||
| * | Remove mass-assignment line from guide summary | Andrew Wilcox | 2013-01-25 | 1 | -1/+0 |
| | | |||||
| * | :scissors: "raise" duplication | Akira Matsuda | 2013-01-26 | 1 | -2/+1 |
| | | |||||
| * | 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 |
| | | |||||
| * | Made indentation consistent. | Philip Arndt | 2013-01-23 | 1 | -1/+1 |
| | | |||||
| * | 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 |
| | | |||||
| * | Fix typo | Tatsuro Baba | 2013-01-22 | 1 | -1/+1 |
| | | |||||
| * | adding comma to separate clauses | vertigoclinic | 2013-01-21 | 1 | -1/+1 |
| | | |||||
| * | Review #translate docs [ci skip] | Carlos Antonio da Silva | 2013-01-20 | 1 | -8/+7 |
| | | |||||
| * | Add documentation for abstract controller #translate and #localize method. | Jens Bissinger | 2013-01-20 | 1 | -0/+10 |
| | | |||||
| * | Add documentation to ActionDispatch::Response | Matthew Stopa | 2013-01-20 | 1 | -0/+7 |
| | | |||||
| * | 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. | ||||
| * | fix broken examples format in image_tag helper [ci skip] | Francesco Rodriguez | 2013-01-18 | 1 | -0/+2 |
| | | |||||
| * | "Asynchronous Mailers" will not be available in 4.0 | Akira Matsuda | 2013-01-18 | 1 | -1/+0 |
| | | |||||
| * | Remove useless number sign | Tatsuro Baba | 2013-01-18 | 1 | -2/+2 |
| | | | | | | | | I think that these signs are probably mistake. | ||||
| * | 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 | ||||
| * | repeating documentation for option form helpers | Thiago Pinto | 2013-01-17 | 1 | -0/+286 |
| | | |||||
| * | repeating documentation for date and time form helpers | Thiago Pinto | 2013-01-17 | 1 | -0/+148 |
| | | |||||
| * | fix example of setting DEFAULTS in fixtures | Jonathan Garvin | 2013-01-16 | 1 | -2/+2 |
| | | |||||
| * | clarify awkward sentence re: email testing | Jonathan Garvin | 2013-01-16 | 1 | -1/+1 |
| | | |||||
| * | Fix typo introduced in 0004ca3a | Carlos Antonio da Silva | 2013-01-16 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
| * | Fix formatting error introduced in cc585c8. | Nicholas Schultz-Møller | 2013-01-16 | 1 | -1/+2 |
| | | |||||
| * | More documentation for ActionDispatch::Response | Matthew Stopa | 2013-01-16 | 1 | -1/+3 |
| | | | | | | | | [ci skip] | ||||
| * | Document ActionDispatch::Response#body method | Matthew Stopa | 2013-01-16 | 1 | -0/+1 |
| | | |||||
| * | 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 "fix history" | davetoxa | 2013-01-16 | 1 | -123/+0 |
| | | | | | | | | This reverts commit dd319600010f4fdc4fac58e5b192bb96fe0d3d7e. | ||||
| * | Revert "Improves documentation about Fragment Caching. [ci skip]" | davetoxa | 2013-01-16 | 1 | -47/+0 |
| | | | | | | | | This reverts commit 814c9875ec4cf01e1348d1ab1c9d12eee5a9adac. | ||||
| * | fix history | davetoxa | 2013-01-16 | 1 | -0/+123 |
| | | |||||
| * | 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 reference to ActiveSupport::ProxyObject | Matt Bridges | 2013-01-13 | 1 | -1/+1 |
| | | |||||
| * | 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 |
| | | |||||
| * | Clarified the minute option on DateTime#change | Jakob Waller | 2013-01-10 | 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 #9078 from senny/6865_ar_count_with_uniq | Rafael Mendonça França | 2013-01-26 | 3 | -1/+15 |
|\ \ \ | | | | | | | | | `#count` in conjunction with `#uniq` performs distinct count. | ||||
| * | | | `#count` in conjunction with `#uniq` performs distinct count. | Yves Senn | 2013-01-26 | 3 | -1/+15 |
| | | | | | | | | | | | | | | | | closes #6865 |