aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix documentation bug in Rails::EngineTrotter Cashion2012-01-191-1/+1
* document AR::Base#with_lock in release notes [ci skip]Vijay Dev2012-01-191-0/+27
* update the getting_started guide code [ci skip]Vijay Dev2012-01-199-24/+57
* Merge pull request #4531 from exviva/pessimistic_with_lockAaron Patterson2012-01-194-1/+81
|\
| * Add ActiveRecord::Base#with_lockOlek Janiszewski2012-01-184-1/+81
* | Merge pull request #4538 from kennyj/should_use_uri_parseAaron Patterson2012-01-194-11/+7
|\ \
| * | Convert URI.parser.parse to URI.parse, and remove ruby 1.8.x code.kennyj2012-01-194-11/+7
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-192-1/+3
|\ \ \
| * | | revising release notes [ci skip]Vijay Dev2012-01-191-2/+2
| * | | Fix small typo in mail_to docs in url_helper.rbSimon Baird2012-01-191-1/+1
| * | | update release note: timestamps is non-null as defaultFujimura Daisuke2012-01-191-0/+2
* | | | select doesn't take multiple arguments - fixes #4539 [ci skip]Vijay Dev2012-01-191-5/+5
* | | | Merge pull request #4532 from rafaelfranca/av-button_to-refactorJosé Valim2012-01-194-20/+40
|\ \ \ \
| * | | | Extract method_tagRafael Mendonça França2012-01-192-2/+6
| * | | | Refactor button_to helper to use token_tag methodRafael Mendonça França2012-01-194-18/+34
| | |_|/ | |/| |
* | | | Merge pull request #4534 from lest/patch-1Piotr Sarnacki2012-01-181-29/+8
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | refactor RAILS_CACHE deprecationSergey Nartimov2012-01-191-29/+8
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-191-1/+7
|\ \ | |/ |/|
| * revise wording [ci skip]Vijay Dev2012-01-191-2/+2
| * Adding Action Mailer section to 3.2 release notesGuillermo Iguaran2012-01-181-0/+6
| * Update Release Notes: sprockets-rails section should be inside of ActionPack ...Guillermo Iguaran2012-01-181-1/+1
* | Merge pull request #4527 from rafaelfranca/av-loggerJosé Valim2012-01-182-11/+0
|\ \ | |/ |/|
| * Test::Unit::Collector::ObjectSpace is not present anymoreRafael Mendonça França2012-01-181-10/+0
| * Remove delegation to ActionController::BaseRafael Mendonça França2012-01-181-1/+0
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-01-192-2/+3
|\ \ | |/ |/|
| * Revert "Remove redundant mention of escape_javascript alias."Vijay Dev2012-01-191-1/+1
| * Update docs for config.assets.loggerRafael Mendonça França2012-01-181-2/+1
| * Add documentation to config.assets.loggerRafael Mendonça França2012-01-171-0/+2
| * Remove redundant mention of escape_javascript alias.Hendy Tanata2012-01-161-1/+1
| * Merge pull request #76 from makoto/masterVijay Dev2012-01-161-2/+2
| |\
| | * ActionController::UrlEncodedPairParser is deprecated. Replaced the url parsin...Makoto Inoue2012-01-161-2/+2
* | | updates to 3.2 release notesVijay Dev2012-01-181-1/+19
* | | Merge pull request #4523 from rafaelfranca/av-loggerAaron Patterson2012-01-187-7/+12
|\ \ \
| * | | ActionView now has its own loggerRafael Mendonça França2012-01-187-7/+12
|/ / /
* | | Merge pull request #4522 from kennyj/fix_warning_20120119José Valim2012-01-181-1/+1
|\ \ \
| * | | Fix warning: assigned but unused variable - resultkennyj2012-01-191-1/+1
|/ / /
* | | Merge pull request #4517 from carlosantoniodasilva/form-builder-blockJosé Valim2012-01-182-13/+10
|\ \ \
| * | | Refactor FormBuilder arguments and default configCarlos Antonio da Silva2012-01-182-13/+10
|/ / /
* | | Merge pull request #4509 from rafaelfranca/form_tag-refactorJosé Valim2012-01-172-6/+5
|\ \ \
| * | | No need to call html_safe since concat two SaffeBuffers always results in a S...Rafael Mendonça França2012-01-171-1/+1
| * | | Use block syntax to avoid code duplicationRafael Mendonça França2012-01-171-3/+3
| * | | No need to create a SafeBuffer since form_tag_html always rerturn a SafeBufferRafael Mendonça França2012-01-171-2/+1
* | | | Merge pull request #4510 from carlosantoniodasilva/av-content-tag-forJosé Valim2012-01-172-54/+52
|\ \ \ \
| * | | | Fix errors when running entire suite due to class name collisionCarlos Antonio da Silva2012-01-182-25/+25
| * | | | Cleanup Post model, no need to require fake_modelsCarlos Antonio da Silva2012-01-181-17/+6
| * | | | Refactor content tag to not detect options Hash alwaysCarlos Antonio da Silva2012-01-181-7/+6
| * | | | Do not mutate options hashCarlos Antonio da Silva2012-01-182-2/+8
| * | | | Cleanup persisted setup for modelCarlos Antonio da Silva2012-01-181-7/+7
| * | | | Mimic AR models yielding when building new records, avoid using tapCarlos Antonio da Silva2012-01-181-6/+8
| * | | | No need for concat as wellCarlos Antonio da Silva2012-01-181-4/+4