Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove deprecation warning from console output when running | Waseem Ahmad | 2012-01-22 | 1 | -1/+3 |
| | | | | activesupport tests. | ||||
* | Merge pull request #4582 from kennyj/fix_4580 | José Valim | 2012-01-21 | 2 | -1/+5 |
|\ | | | | | Fix GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR | ||||
| * | Fix GH #4580. Rails 3.2: uninitialized constant ↵ | kennyj | 2012-01-22 | 2 | -1/+5 |
|/ | | | | ActiveSupport::TaggedLogging::ERROR | ||||
* | document `:raise` option support for several helpers [ci skip] | Jonathan Roes | 2012-01-21 | 1 | -0/+3 |
| | |||||
* | Fix another race condition. | Jon Leighton | 2012-01-20 | 4 | -6/+23 |
| | | | | | | | | | | From 2c667f69aa2daac5ee6c29ca9679616e2a71532a. Thanks @pwnall for the heads-up. Conflicts: activerecord/lib/active_record/core.rb | ||||
* | Preparing for 3.2.0 release | David Heinemeier Hansson | 2012-01-20 | 16 | -19/+17 |
| | |||||
* | update release notes [ci skip] | Vijay Dev | 2012-01-20 | 1 | -2/+0 |
| | |||||
* | Update CHANGELOG | José Valim | 2012-01-19 | 1 | -2/+0 |
| | |||||
* | Do not deprecate performed? | José Valim | 2012-01-19 | 3 | -6/+10 |
| | |||||
* | add uglifier version info in the 'what to update' section | Vijay Dev | 2012-01-19 | 1 | -0/+1 |
| | |||||
* | fix duplicate ids for the headers [ci skip] | Vijay Dev | 2012-01-19 | 1 | -7/+7 |
| | |||||
* | document AR::Base#with_lock in release notes [ci skip] | Vijay Dev | 2012-01-19 | 1 | -0/+27 |
| | |||||
* | update the getting_started guide code [ci skip] | Vijay Dev | 2012-01-19 | 9 | -24/+57 |
| | |||||
* | Merge pull request #4531 from exviva/pessimistic_with_lock | Aaron Patterson | 2012-01-19 | 4 | -1/+81 |
| | | | | Add ActiveRecord::Base#with_lock | ||||
* | Fix small typo in mail_to docs in url_helper.rb | Simon Baird | 2012-01-19 | 1 | -1/+1 |
| | |||||
* | revising release notes [ci skip] | Vijay Dev | 2012-01-19 | 1 | -2/+2 |
| | |||||
* | 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 | -2/+2 |
| | | | | | Didn't cherry pick the master commit because this one already had some of the fixes made in master. | ||||
* | 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-19 | 1 | -0/+6 |
| | |||||
* | Update Release Notes: sprockets-rails section should be inside of ActionPack ↵ | Guillermo Iguaran | 2012-01-19 | 1 | -1/+1 |
| | | | | section | ||||
* | Merge pull request #4525 from guilleiguaran/am-changelog-3-2-stable | Vijay Dev | 2012-01-18 | 1 | -1/+8 |
|\ | | | | | Update AM CHANGELOG | ||||
| * | Update AM CHANGELOG | Guillermo Iguaran | 2012-01-18 | 1 | -1/+8 |
| | | |||||
* | | ActionController::UrlEncodedPairParser is deprecated. Replaced the url ↵ | Makoto Inoue | 2012-01-19 | 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 #4518 from guilleiguaran/silent-sprockets-logger-3-2-stable | José Valim | 2012-01-18 | 4 | -3/+8 |
|\ | | | | | Silent Sprockets logger when config.assets.logger is set to false (3-2-stable) | ||||
| * | Update CHANGELOG and docs for config.assets.logger | Guillermo Iguaran | 2012-01-18 | 2 | -2/+3 |
| | | |||||
| * | Silent Sprockets logger when config.assets.logger is set to false | Guillermo Iguaran | 2012-01-18 | 2 | -1/+5 |
|/ | |||||
* | Merge pull request #4498 from ↵ | José Valim | 2012-01-17 | 11 | -46/+87 |
|\ | | | | | | | | | carlosantoniodasilva/action-controller-refactor-3-2 Action controller refactor - deprecate Compatibility module | ||||
| * | Update changelog | Carlos Antonio da Silva | 2012-01-17 | 1 | -1/+16 |
| | | |||||
| * | Remove duplicated constant definition | Carlos Antonio da Silva | 2012-01-17 | 1 | -3/+0 |
| | | | | | | | | | | ActionController::ActionControllerError is already defined in action_controller/metal/exceptions. | ||||
| * | Deprecate AC::UnknownError and AC::DoubleRenderError | Carlos Antonio da Silva | 2012-01-17 | 5 | -12/+12 |
| | | | | | | | | | | Use the constants AbstractController::ActionNotFound and AbstractController::DoubleRenderError respectively instead. | ||||
| * | Add default charset config to ActionDispatch | Carlos Antonio da Silva | 2012-01-17 | 2 | -1/+10 |
| | | |||||
| * | Deprecate default_charset= at controller level | Carlos Antonio da Silva | 2012-01-17 | 2 | -14/+24 |
| | | |||||
| * | Add some deprecations for logic being removed in 4.0 | Carlos Antonio da Silva | 2012-01-17 | 5 | -15/+25 |
|/ | |||||
* | Merge pull request #4487 from sarenji/fix-reset-counters | Aaron Patterson | 2012-01-17 | 7 | -3/+45 |
| | | | | Fix bug where reset_counters resets the wrong counter cache. | ||||
* | Merge pull request #4501 from rafaelfranca/assets-logger-3-2 | José Valim | 2012-01-17 | 3 | -1/+5 |
|\ | | | | | Add option to configure Sprockets logger [3-2-stable] | ||||
| * | Add option to configure Sprockets logger | Rafael Mendonça França | 2012-01-17 | 3 | -1/+5 |
|/ | |||||
* | Merge pull request #4492 from pkondzior/3-2-stable | Piotr Sarnacki | 2012-01-17 | 2 | -1/+22 |
|\ | | | | | Wrong behavior of ActiveModel::Errors#dup is causing regressions on applications using Rails 3-2-stable | ||||
| * | Fix ActiveModel::Errors#dup | Paweł Kondzior | 2012-01-16 | 2 | -1/+22 |
|/ | | | | | | | | | | | | Since ActiveModel::Errors instance keeps all error messages as hash we should duplicate this object as well. Previously ActiveModel::Errors was a subclass of ActiveSupport::OrderedHash, which results in different behavior on dup, this may result in regression for people relying on it. Because Rails 3.2 stills supports Ruby 1.8.7 in order to properly fix this regression we need to backport #initialize_dup. | ||||
* | Merge pull request #4462 from spohlenz/fix-routing-tests | Aaron Patterson | 2012-01-16 | 1 | -0/+4 |
| | | | | Stub ip method of alternative request class in router tests | ||||
* | Apparently asssert_empty is not available in 1.8.7 | Piotr Sarnacki | 2012-01-16 | 1 | -1/+1 |
| | |||||
* | minor edits in getting started guide | Vijay Dev | 2012-01-16 | 1 | -2/+2 |
| | |||||
* | copy editing asset pipeline changes | Vijay Dev | 2012-01-16 | 1 | -7/+6 |
| | |||||
* | [docs] Update pipeline asset organization section. | Richard Hulse | 2012-01-16 | 1 | -4/+57 |
| | | | | | * Calified how assets are included. * Added information about using index manifests. | ||||
* | change class to id per scaffold change | Dan Pickett | 2012-01-16 | 1 | -7/+7 |
| | | | | #4472 | ||||
* | Improve description of :allow_destroy option for nested attributes in ↵ | Carlos Antonio da Silva | 2012-01-16 | 1 | -7/+7 |
| | | | | getting started guide | ||||
* | Getting Started Guide: Update reference about JavaScript runtimes | Guillermo Iguaran | 2012-01-16 | 1 | -1/+7 |
| | |||||
* | Add ActiveModel::Errors#delete, which was not available after move to use ↵ | Piotr Sarnacki | 2012-01-16 | 2 | -0/+12 |
| | | | | delegation | ||||
* | Merge pull request #4474 from guilleiguaran/fix-route-inspector-3-2-stable | José Valim | 2012-01-15 | 2 | -1/+16 |
|\ | | | | | Don't hardcode assets route skipped in route inspector (3-2-stable) |