aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* No need to check html_safe? twiceRafael Mendonça França2012-01-202-2/+3
* Merge pull request #4555 from kennyj/mail_bumpJosé Valim2012-01-201-1/+1
|\
| * Bump mailkennyj2012-01-201-1/+1
|/
* Merge pull request #4554 from rodrigoflores/masterJosé Valim2012-01-203-2/+11
|\
| * Added format to percentageRodrigo Flores2012-01-203-2/+11
* | Merge pull request #4545 from trotter/fix-documentation-bugVijay Dev2012-01-201-1/+1
|\ \ | |/ |/|
| * Fix documentation bug in Rails::EngineTrotter Cashion2012-01-191-1/+1
* | push ivar initialization down to a common methodAaron Patterson2012-01-191-16/+20
* | adding tests for previous_changes hashAaron Patterson2012-01-191-0/+25
* | just use an alias. The target method is public, so make this one publicAaron Patterson2012-01-191-4/+1
* | remove unused capturesAaron Patterson2012-01-191-2/+2
* | avoid useless is_a checksAaron Patterson2012-01-191-8/+8
* | move tagged logging to a module, stop proxying every method callAaron Patterson2012-01-191-36/+32
* | Merge pull request #4546 from carlosantoniodasilva/response-body-performedJosé Valim2012-01-193-8/+5
|\ \
| * | Use performed? instead of checking for response_bodyCarlos Antonio da Silva2012-01-193-8/+5
|/ /
* | do not do reverse lookups on incoming requests for webrick. fixes #4542Aaron Patterson2012-01-191-0/+1
* | update release notes [ci skip]Vijay Dev2012-01-201-2/+0
* | Do not deprecate performed.José Valim2012-01-193-2/+11
* | add uglifier version info in the 'what to update' sectionVijay Dev2012-01-191-0/+1
* | fix duplicate ids for the headers [ci skip]Vijay Dev2012-01-191-7/+7
|/
* 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