aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| * | | | Fix errors when running entire suite due to class name collisionCarlos Antonio da Silva2012-01-182-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Post class is created everywhere in the test suite, and due to that when applying the Array() logic to refactor content_tag_for, some other change to the Post class was breaking record tag tests. The solution is to rename the class to not collide with others already defined in the test suite.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | Only check for options and prefix arguments order once when running content_tag_for with a collection.
| * | | | 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
| | | | |
| * | | | Add test for content tag with prefix and extra html optionsCarlos Antonio da Silva2012-01-181-4/+10
| | | | |
| * | | | Remove capture.Tim Cooper2012-01-181-1/+1
| | | | |
| * | | | Always treat the object passed to content_tag_for as an array.Tim Cooper2012-01-181-7/+3
| |/ / /
* | | | Merge pull request #4512 from guilleiguaran/silent-sprockets-loggerJosé Valim2012-01-172-1/+5
|\ \ \ \ | | | | | | | | | | Silent Sprockets logger when config.assets.logger is set to false
| * | | | Silent Sprockets logger when config.assets.logger is set to falseGuillermo Iguaran2012-01-172-1/+5
| |/ / /
* | | | Merge pull request #4508 from lest/patch-1José Valim2012-01-173-7/+2
|\ \ \ \ | |/ / / |/| | | Refactor TaggedLogging
| * | | simplify some TaggedLogging methodsSergey Nartimov2012-01-181-2/+2
| | | |
| * | | remove unused requiresSergey Nartimov2012-01-182-5/+0
|/ / /
* | | Merge pull request #4488 from rafaelfranca/av-refactorXavier Noria2012-01-1729-436/+688
|\ \ \ | | | | | | | | ActionView::Helpers::FormHelper refactoring
| * | | Extract input_checked? to a moduleRafael Mendonça França2012-01-174-9/+24
| | | |
| * | | Do not need of ActionView::Helpers scope since we are insideRafael Mendonça França2012-01-173-21/+21
| | | | | | | | | | | | | | | | ActionView::Helpers
| * | | Remove unused codeRafael Mendonça França2012-01-171-39/+0
| | | |
| * | | Do not need each here anymoreRafael Mendonça França2012-01-171-3/+1
| | | |
| * | | Extract DatetimeSelectRafael Mendonça França2012-01-174-54/+11
| | | |
| * | | Extract TimeSelectRafael Mendonça França2012-01-175-7/+16
| | | |
| * | | Extract DateSelectRafael Mendonça França2012-01-174-6/+63
| | | |
| * | | CleanupRafael Mendonça França2012-01-171-72/+1
| | | |
| * | | Extract TimeZoneSelectRafael Mendonça França2012-01-173-34/+22
| | | |
| * | | Extract GroupedCollectionSelectRafael Mendonça França2012-01-173-24/+43
| | | |
| * | | Extract CollectionSelectRafael Mendonça França2012-01-175-51/+64
| | | |