Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Add ActiveRecord::Base#with_lock | Olek Janiszewski | 2012-01-18 | 4 | -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_parse | Aaron Patterson | 2012-01-19 | 4 | -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. | kennyj | 2012-01-19 | 4 | -11/+7 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-01-19 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | revising release notes [ci skip] | Vijay Dev | 2012-01-19 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix small typo in mail_to docs in url_helper.rb | Simon Baird | 2012-01-19 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | update release note: timestamps is non-null as default | Fujimura Daisuke | 2012-01-19 | 1 | -0/+2 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | select doesn't take multiple arguments - fixes #4539 [ci skip] | Vijay Dev | 2012-01-19 | 1 | -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-refactor | José Valim | 2012-01-19 | 4 | -20/+40 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Refactor button_to helper to use token_tag method | |||||
| * | | | | | | | Extract method_tag | Rafael Mendonça França | 2012-01-19 | 2 | -2/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | Refactor button_to helper to use token_tag method | Rafael Mendonça França | 2012-01-19 | 4 | -18/+34 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #4534 from lest/patch-1 | Piotr Sarnacki | 2012-01-18 | 1 | -29/+8 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | refactor RAILS_CACHE deprecation | |||||
| * | | | | | refactor RAILS_CACHE deprecation | Sergey Nartimov | 2012-01-19 | 1 | -29/+8 | |
|/ / / / / | | | | | | | | | | | | | | | | that was introduced in 6f8159c4217dc8433a2027ced0c61e7ce94551d3 | |||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-01-19 | 1 | -1/+7 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | revise wording [ci skip] | Vijay Dev | 2012-01-19 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Adding Action Mailer section to 3.2 release notes | Guillermo Iguaran | 2012-01-18 | 1 | -0/+6 | |
| | | | | | ||||||
| * | | | | Update Release Notes: sprockets-rails section should be inside of ActionPack ↵ | Guillermo Iguaran | 2012-01-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | section | |||||
* | | | | | Merge pull request #4527 from rafaelfranca/av-logger | José Valim | 2012-01-18 | 2 | -11/+0 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove delegation to ActionController::Base | |||||
| * | | | | Test::Unit::Collector::ObjectSpace is not present anymore | Rafael Mendonça França | 2012-01-18 | 1 | -10/+0 | |
| | | | | | ||||||
| * | | | | Remove delegation to ActionController::Base | Rafael Mendonça França | 2012-01-18 | 1 | -1/+0 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-01-19 | 2 | -2/+3 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Revert "Remove redundant mention of escape_javascript alias." | Vijay Dev | 2012-01-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d7f7f5ee560fafa7e9819786e41bf0ea6df7919b. Reason: That isn't redundant IMO. | |||||
| * | | | | Update docs for config.assets.logger | Rafael Mendonça França | 2012-01-18 | 1 | -2/+1 | |
| | | | | | ||||||
| * | | | | Add documentation to config.assets.logger | Rafael Mendonça França | 2012-01-17 | 1 | -0/+2 | |
| | | | | | ||||||
| * | | | | Remove redundant mention of escape_javascript alias. | Hendy Tanata | 2012-01-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | The doc already shows the alias. | |||||
| * | | | | Merge pull request #76 from makoto/master | Vijay Dev | 2012-01-16 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | | | UrlEncodedPairParser is deprecated, but still used as an example | |||||
| | * | | | | ActionController::UrlEncodedPairParser is deprecated. Replaced the url ↵ | Makoto Inoue | 2012-01-16 | 1 | -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 notes | Vijay Dev | 2012-01-18 | 1 | -1/+19 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #4523 from rafaelfranca/av-logger | Aaron Patterson | 2012-01-18 | 7 | -7/+12 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Add ActionView own logger | |||||
| * | | | | | ActionView now has its own logger | Rafael Mendonça França | 2012-01-18 | 7 | -7/+12 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #4522 from kennyj/fix_warning_20120119 | José Valim | 2012-01-18 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix warning: assigned but unused variable - result | |||||
| * | | | | | Fix warning: assigned but unused variable - result | kennyj | 2012-01-19 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #4517 from carlosantoniodasilva/form-builder-block | José Valim | 2012-01-18 | 2 | -13/+10 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Refactor FormBuilder arguments and default config | |||||
| * | | | | Refactor FormBuilder arguments and default config | Carlos Antonio da Silva | 2012-01-18 | 2 | -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-refactor | José Valim | 2012-01-17 | 2 | -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ça | 2012-01-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | SafeBuffer | |||||
| * | | | | Use block syntax to avoid code duplication | Rafael Mendonça França | 2012-01-17 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | No need to create a SafeBuffer since form_tag_html always rerturn a SafeBuffer | Rafael Mendonça França | 2012-01-17 | 1 | -2/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #4510 from carlosantoniodasilva/av-content-tag-for | José Valim | 2012-01-17 | 2 | -54/+52 | |
|\ \ \ \ \ | | | | | | | | | | | | | ActionView content_tag_for refactoring and improvements | |||||
| * | | | | | Fix errors when running entire suite due to class name collision | Carlos Antonio da Silva | 2012-01-18 | 2 | -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_models | Carlos Antonio da Silva | 2012-01-18 | 1 | -17/+6 | |
| | | | | | | ||||||
| * | | | | | Refactor content tag to not detect options Hash always | Carlos Antonio da Silva | 2012-01-18 | 1 | -7/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only check for options and prefix arguments order once when running content_tag_for with a collection. | |||||
| * | | | | | Do not mutate options hash | Carlos Antonio da Silva | 2012-01-18 | 2 | -2/+8 | |
| | | | | | | ||||||
| * | | | | | Cleanup persisted setup for model | Carlos Antonio da Silva | 2012-01-18 | 1 | -7/+7 | |
| | | | | | | ||||||
| * | | | | | Mimic AR models yielding when building new records, avoid using tap | Carlos Antonio da Silva | 2012-01-18 | 1 | -6/+8 | |
| | | | | | | ||||||
| * | | | | | No need for concat as well | Carlos Antonio da Silva | 2012-01-18 | 1 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | Add test for content tag with prefix and extra html options | Carlos Antonio da Silva | 2012-01-18 | 1 | -4/+10 | |
| | | | | | | ||||||
| * | | | | | Remove capture. | Tim Cooper | 2012-01-18 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Always treat the object passed to content_tag_for as an array. | Tim Cooper | 2012-01-18 | 1 | -7/+3 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #4512 from guilleiguaran/silent-sprockets-logger | José Valim | 2012-01-17 | 2 | -1/+5 | |
|\ \ \ \ \ | | | | | | | | | | | | | Silent Sprockets logger when config.assets.logger is set to false |