aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #4528 from j-manu/log-tailer-fixAaron Patterson2012-01-201-3/+7
|\ \ \ | | | | | | | | Fix for log tailer when the log file doesn't exist.
| * | | Fix for log tailer when the log file doesn't exist.Manu J2012-01-201-3/+7
| | | |
* | | | Merge pull request #4556 from brainopia/remove_old_cruftAaron Patterson2012-01-206-11/+10
|\ \ \ \ | | | | | | | | | | Removed unused assigns from ActionView::Template::Error
| * | | | Removed unused assigns from ActionView::Template::Errorbrainopia2012-01-206-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | They existed since initial rails commit by DHH but lost use a long time ago
* | | | | Merge pull request #4557 from rafaelfranca/av-number_helper-refactorJosé Valim2012-01-202-2/+3
|\ \ \ \ \ | | | | | | | | | | | | No need to check html_safe? twice at number_to_percentage
| * | | | | No need to check html_safe? twiceRafael Mendonça França2012-01-202-2/+3
| |/ / / /
* / / / / Revert "just use an alias. The target method is public, so make this one ↵Aaron Patterson2012-01-201-1/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | public" This reverts commit be7d2248e9505983d1aacf0b33c657e6e3ddd9db.
* | | | Merge pull request #4555 from kennyj/mail_bumpJosé Valim2012-01-201-1/+1
|\ \ \ \ | | | | | | | | | | Bump mail 2.4.1
| * | | | Bump mailkennyj2012-01-201-1/+1
|/ / / /
* | | | Merge pull request #4554 from rodrigoflores/masterJosé Valim2012-01-203-2/+11
|\ \ \ \ | | | | | | | | | | Added the :format option to number_to_percentage
| * | | | 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::Engine
| * | | | 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
| | | | | | | | | | | | | | | | | | | | too.
* | | | | 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_body
| * | | | | Use performed? instead of checking for response_bodyCarlos Antonio da Silva2012-01-193-8/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * Check for performed? instead of response_body * Change performed? to return a boolean * Refactor AC::Metal#response_body= to reuse variable
* | | | | 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_lock
| * | | | Add ActiveRecord::Base#with_lockOlek Janiszewski2012-01-184-1/+81
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `with_lock` method to ActiveRecord objects, which starts a transaction, locks the object (pessimistically) and yields to the block. The method takes one (optional) parameter and passes it to `lock!`. Before: class Order < ActiveRecord::Base def cancel! transaction do lock! # ... cancelling logic end end end After: class Order < ActiveRecord::Base def cancel! with_lock do # ... cancelling logic end end end
* | | | 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.
| * | | 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
| | | | | | | | | | | | | | | | | | | | Also, fixed the bit about returning AM::MissingAttributeError. This seems to be fixed earlier in 3-2-stable only.
* | | | Merge pull request #4532 from rafaelfranca/av-button_to-refactorJosé Valim2012-01-194-20/+40
|\ \ \ \ | | | | | | | | | | Refactor button_to helper to use token_tag method
| * | | | 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 deprecation
| * | refactor RAILS_CACHE deprecationSergey Nartimov2012-01-191-29/+8
|/ / | | | | | | that was introduced in 6f8159c4217dc8433a2027ced0c61e7ce94551d3
* | 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
| | | | | | | | section
* | Merge pull request #4527 from rafaelfranca/av-loggerJosé Valim2012-01-182-11/+0
|\ \ | |/ |/| Remove delegation to ActionController::Base
| * 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
|\ \ | |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 17:54:56 +0000