aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
|\ \ | |/ |/|
| * Revert "Remove redundant mention of escape_javascript alias."Vijay Dev2012-01-191-1/+1
| | | | | | | | | | | | This reverts commit d7f7f5ee560fafa7e9819786e41bf0ea6df7919b. Reason: That isn't redundant IMO.
| * 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
| | | | | | | | The doc already shows the alias.
| * Merge pull request #76 from makoto/masterVijay Dev2012-01-161-2/+2
| |\ | | | | | | UrlEncodedPairParser is deprecated, but still used as an example
| | * ActionController::UrlEncodedPairParser is deprecated. Replaced the url ↵Makoto Inoue2012-01-161-2/+2
| | | | | | | | | | | | | | | parsing example with Rack::Utils.parse_query - https://webrat.lighthouseapp.com/projects/10503/tickets/161-urlencodedpairparser-removed-in-edge-rails
* | | updates to 3.2 release notesVijay Dev2012-01-181-1/+19
| | |
* | | Merge pull request #4523 from rafaelfranca/av-loggerAaron Patterson2012-01-187-7/+12
|\ \ \ | | | | | | | | Add ActionView own logger
| * | | 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 - result
| * | | 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 config
| * | | Refactor FormBuilder arguments and default configCarlos Antonio da Silva2012-01-182-13/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * Do not reopen AV::Base to define default form builder Inside the load hook we are already in AV::Base context. * Do not pass the given block to the form builder The block is evaluated in fields_for context using capture, with the builder as argument. This means we do not need to give the block to the FormBuilder itself.
* | | Merge pull request #4509 from rafaelfranca/form_tag-refactorJosé Valim2012-01-172-6/+5
|\ \ \ | | | | | | | | Refactor form_for and form_tag
| * | | No need to call html_safe since concat two SaffeBuffers always results in a ↵Rafael Mendonça França2012-01-171-1/+1
| | | | | | | | | | | | | | | | SafeBuffer
| * | | 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
|\ \ \ \ | | | | | | | | | | ActionView content_tag_for refactoring and improvements