aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* work against 1-0-stable until a new journey is releasedAaron Patterson2012-01-231-1/+1
|
* Added custom regexps to ASTs that have literal nodes on either side ofAaron Patterson2012-01-232-1/+82
| | | | symbol nodes. Fixes #4585
* Merge pull request #4601 from carlosantoniodasilva/patch-1José Valim2012-01-231-0/+1
|\ | | | | Add missing require to Array#wrap in generators action methods
| * Add missing require to Array#wrap in generators action methodsCarlos Antonio da Silva2012-01-221-0/+1
| |
* | test base64 encode and decodeVijay Dev2012-01-231-0/+9
| |
* | Merge pull request #4611 from jviney/3-2-stableVijay Dev2012-01-231-1/+1
|\ \ | | | | | | Fix ActiveSupport::Base64.decode64
| * | The deprecated ActiveSupport::Base64.decode64 method should call ↵Jonathan Viney2012-01-231-1/+1
|/ / | | | | | | ::Base64.decode64 not ::Base64.encode64
* | Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with ↵José Valim2012-01-222-5/+5
| | | | | | | | bash, zsh, etc, closes #4602
* | Merge pull request #4604 from ihid/3-2-stableJosé Valim2012-01-222-0/+17
|\ \ | |/ |/| 3-2-stable: Fixed regression - unable to use a range as choices for form.select.
| * Allow form.select to accept ranges.Jeremy Walker2012-01-222-0/+17
| |
* | Fix `$rails_rake_task` global variable warning without replacing the value ↵Jonathan Viney2012-01-221-2/+1
| | | | | | | | | | | | | | | | of $rails_rake_task if it is already set. Fixes #4591. Signed-off-by: José Valim <jose.valim@gmail.com>
* | Merge pull request #4586 from waseem/assert_with_no_deprecation_warningsJosé Valim2012-01-211-1/+3
|\ \ | | | | | | Assert with no deprecation warnings activesupport tests.
| * | Remove deprecation warning from console output when runningWaseem Ahmad2012-01-221-1/+3
|/ / | | | | | | activesupport tests.
* | Merge pull request #4582 from kennyj/fix_4580José Valim2012-01-212-1/+5
|\ \ | | | | | | Fix GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR
| * | Fix GH #4580. Rails 3.2: uninitialized constant ↵kennyj2012-01-222-1/+5
|/ / | | | | | | ActiveSupport::TaggedLogging::ERROR
* / document `:raise` option support for several helpers [ci skip]Jonathan Roes2012-01-211-0/+3
|/
* Fix another race condition.Jon Leighton2012-01-204-6/+23
| | | | | | | | | | From 2c667f69aa2daac5ee6c29ca9679616e2a71532a. Thanks @pwnall for the heads-up. Conflicts: activerecord/lib/active_record/core.rb
* Preparing for 3.2.0 releaseDavid Heinemeier Hansson2012-01-2016-19/+17
|
* update release notes [ci skip]Vijay Dev2012-01-201-2/+0
|
* Update CHANGELOGJosé Valim2012-01-191-2/+0
|
* Do not deprecate performed?José Valim2012-01-193-6/+10
|
* 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
* Fix small typo in mail_to docs in url_helper.rbSimon Baird2012-01-191-1/+1
|
* revising release notes [ci skip]Vijay Dev2012-01-191-2/+2
|
* 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-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 Dev2012-01-191-2/+2
|
* Adding Action Mailer section to 3.2 release notesGuillermo Iguaran2012-01-191-0/+6
|
* Update Release Notes: sprockets-rails section should be inside of ActionPack ↵Guillermo Iguaran2012-01-191-1/+1
| | | | section
* Merge pull request #4525 from guilleiguaran/am-changelog-3-2-stableVijay Dev2012-01-181-1/+8
|\ | | | | Update AM CHANGELOG
| * Update AM CHANGELOGGuillermo Iguaran2012-01-181-1/+8
| |
* | ActionController::UrlEncodedPairParser is deprecated. Replaced the url ↵Makoto Inoue2012-01-191-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 #4518 from guilleiguaran/silent-sprockets-logger-3-2-stableJosé Valim2012-01-184-3/+8
|\ | | | | Silent Sprockets logger when config.assets.logger is set to false (3-2-stable)
| * Update CHANGELOG and docs for config.assets.loggerGuillermo Iguaran2012-01-182-2/+3
| |
| * Silent Sprockets logger when config.assets.logger is set to falseGuillermo Iguaran2012-01-182-1/+5
|/
* Merge pull request #4498 from ↵José Valim2012-01-1711-46/+87
|\ | | | | | | | | carlosantoniodasilva/action-controller-refactor-3-2 Action controller refactor - deprecate Compatibility module
| * Update changelogCarlos Antonio da Silva2012-01-171-1/+16
| |
| * Remove duplicated constant definitionCarlos Antonio da Silva2012-01-171-3/+0
| | | | | | | | | | ActionController::ActionControllerError is already defined in action_controller/metal/exceptions.
| * Deprecate AC::UnknownError and AC::DoubleRenderErrorCarlos Antonio da Silva2012-01-175-12/+12
| | | | | | | | | | Use the constants AbstractController::ActionNotFound and AbstractController::DoubleRenderError respectively instead.
| * Add default charset config to ActionDispatchCarlos Antonio da Silva2012-01-172-1/+10
| |
| * Deprecate default_charset= at controller levelCarlos Antonio da Silva2012-01-172-14/+24
| |
| * Add some deprecations for logic being removed in 4.0Carlos Antonio da Silva2012-01-175-15/+25
|/
* Merge pull request #4487 from sarenji/fix-reset-countersAaron Patterson2012-01-177-3/+45
| | | | Fix bug where reset_counters resets the wrong counter cache.
* Merge pull request #4501 from rafaelfranca/assets-logger-3-2José Valim2012-01-173-1/+5
|\ | | | | Add option to configure Sprockets logger [3-2-stable]
| * Add option to configure Sprockets loggerRafael Mendonça França2012-01-173-1/+5
|/