aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'docrails/master'Xavier Noria2013-01-2626-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 docrailsXavier Noria2013-01-265-423/+63
| |
| * Remove mass-assignment line from guide summaryAndrew Wilcox2013-01-251-1/+0
| |
| * :scissors: "raise" duplicationAkira Matsuda2013-01-261-2/+1
| |
| * fix Active Record/Action Pack Changelog linksJuanjo Bazán2013-01-251-2/+2
| |
| * [engines guide] reformatted some stuffWeston Platter2013-01-241-3/+3
| |
| * [engines guide] reworded a run onWeston Platter2013-01-241-3/+2
| |
| * Add new DB rake tasks to the contributing section.Vipul A M2013-01-231-0/+14
| |
| * Made indentation consistent.Philip Arndt2013-01-231-1/+1
| |
| * Typo, grammar, and comma love.Brian Littmann2013-01-221-4/+4
| |
| * Typo fix in guides/source/engines.mdBrian Littmann2013-01-221-1/+1
| |
| * Fix typoTatsuro Baba2013-01-221-1/+1
| |
| * adding comma to separate clausesvertigoclinic2013-01-211-1/+1
| |
| * Review #translate docs [ci skip]Carlos Antonio da Silva2013-01-201-8/+7
| |
| * Add documentation for abstract controller #translate and #localize method.Jens Bissinger2013-01-201-0/+10
| |
| * Add documentation to ActionDispatch::ResponseMatthew Stopa2013-01-201-0/+7
| |
| * consistently inherit from ApplicationController in guides exemplesCyril Jouve2013-01-203-4/+4
| |
| * Replacing plugin to gemLucas Caton2013-01-191-2/+2
| |
| * Replaced documentation for ↵Thomas Drake-Brockman2013-01-201-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 Rodriguez2013-01-181-0/+2
| |
| * "Asynchronous Mailers" will not be available in 4.0Akira Matsuda2013-01-181-1/+0
| |
| * Remove useless number signTatsuro Baba2013-01-181-2/+2
| | | | | | | | I think that these signs are probably mistake.
| * for recommended Apache configuration of asset pipeline, use <Location> ↵Erik Johnson2013-01-171-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 helpersThiago Pinto2013-01-171-0/+286
| |
| * repeating documentation for date and time form helpersThiago Pinto2013-01-171-0/+148
| |
| * fix example of setting DEFAULTS in fixturesJonathan Garvin2013-01-161-2/+2
| |
| * clarify awkward sentence re: email testingJonathan Garvin2013-01-161-1/+1
| |
| * Fix typo introduced in 0004ca3aCarlos Antonio da Silva2013-01-161-1/+1
| | | | | | | | [ci skip]
| * Fix formatting error introduced in cc585c8.Nicholas Schultz-Møller2013-01-161-1/+2
| |
| * More documentation for ActionDispatch::ResponseMatthew Stopa2013-01-161-1/+3
| | | | | | | | [ci skip]
| * Document ActionDispatch::Response#body methodMatthew Stopa2013-01-161-0/+1
| |
| * removes spurious file pushed in cc585c8Xavier Noria2013-01-151-349/+0
| |
| * revert to 814c9875ec4cf01e1348d1ab1c9d12eee5a9adacdavetoxa2013-01-162-0/+393
| |
| * Revert "fix history"davetoxa2013-01-161-123/+0
| | | | | | | | This reverts commit dd319600010f4fdc4fac58e5b192bb96fe0d3d7e.
| * Revert "Improves documentation about Fragment Caching. [ci skip]"davetoxa2013-01-161-47/+0
| | | | | | | | This reverts commit 814c9875ec4cf01e1348d1ab1c9d12eee5a9adac.
| * fix historydavetoxa2013-01-161-0/+123
| |
| * Improves documentation about Fragment Caching. [ci skip]Nicholas Schultz-Møller2013-01-151-0/+47
| | | | | | | | | | | | Adds documentation for: - Aggregate cache keys, - using an ActiveRecord model as cache key and - Russian Doll Caching.
| * fix reference to ActiveSupport::ProxyObjectMatt Bridges2013-01-131-1/+1
| |
| * Fix simple expressionJude Arasu2013-01-131-1/+1
| |
| * Fix typo in guides/source/engines.mdZachary Porter2013-01-111-1/+1
| |
| * Fix typo in guides/source/engines.mdZachary Porter2013-01-111-1/+1
| |
| * Update engine application layout file pathZachary Porter2013-01-111-1/+1
| |
| * Update guides/source/active_record_basics.mdBenoit Caccinolo2013-01-111-1/+1
| |
| * Clarified the minute option on DateTime#changeJakob Waller2013-01-101-1/+1
| |
| * update assets guide code stylingGosha Arinich2013-01-101-8/+8
| | | | | | | | | | | | * 1.9 hash syntax * proper formatting around one line blocks * do-end for multiline blocks
| * remove 'update' duplicationsJuanjo Bazán2013-01-082-2/+0
| |
* | Merge pull request #9084 from senny/document_am_delivieries_resetJosé Valim2013-01-261-0/+2
|\ \ | | | | | | document the behavior of `ActionMailer::Base.delivieries` in tests
| * | document the behavior of `ActionMailer::Base.delivieries` in testsYves Senn2013-01-261-0/+2
| | | | | | | | | | | | thanks @danielpuglisi
* | | Merge pull request #9078 from senny/6865_ar_count_with_uniqRafael Mendonça França2013-01-263-1/+15
|\ \ \ | | | | | | | | `#count` in conjunction with `#uniq` performs distinct count.
| * | | `#count` in conjunction with `#uniq` performs distinct count.Yves Senn2013-01-263-1/+15
| | | | | | | | | | | | | | | | closes #6865