Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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) | ||||
| * | Don't hardcode assets route skipped in route inspector | Guillermo Iguaran | 2012-01-15 | 2 | -1/+16 |
|/ | | | | | | Conflicts: railties/lib/rails/application/route_inspector.rb | ||||
* | Fix stack level too deep when model does not have attributes method. | Piotr Sarnacki | 2012-01-15 | 2 | -1/+9 |
| | | | | | | | | | | | Without that patch when using ActiveModel::AttributeMethods in a class that does not respond to `attributes` method, stack level too deep error will be raised on non existing method. While documentation is clear that you need to define `attributes` method in order to use AttributeMethods module, `stack level too deep` is rather obscure and hard to debug, therefore we should try to not break `method_missing` if someone forgets about defining `attributes`. | ||||
* | Upgrade mail dependency to 2.4.0 | Mikel Lindsaar | 2012-01-15 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4471 from semaperepelitsa/enum_sum | Aaron Patterson | 2012-01-14 | 1 | -1/+1 |
|\ | | | | | Pass a symbol instead of a block in Enumerable#sum | ||||
| * | Pass a symbol instead of a block. This is faster and more concise. | Semyon Perepelitsa | 2012-01-15 | 1 | -1/+1 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least Ruby 1.8.7 is required which is ok since 3.2. Benchmark: ```ruby require "benchmark" enum = 1..10_000 N = 100 Benchmark.bm do |x| x.report "inject block" do N.times do enum.inject { |sum, n| sum + n } end end x.report "inject symbol" do N.times do enum.inject(:+) end end end ``` Result: ``` user system total real inject block 0.160000 0.000000 0.160000 ( 0.179723) inject symbol 0.090000 0.000000 0.090000 ( 0.095667) ``` | ||||
* | Add begin/ensure block since we are returning. | José Valim | 2012-01-14 | 1 | -3/+5 |
| | |||||
* | Fix race condition :bomb: | Jon Leighton | 2012-01-13 | 1 | -4/+11 |
| | |||||
* | Use a BodyProxy instead of including a Module that responds to close. | Santiago Pastorino | 2012-01-13 | 5 | -15/+49 |
| | | | | Closes #4441 if Active Record is disabled assets are delivered correctly | ||||
* | No AS::TestCase here. | José Valim | 2012-01-13 | 1 | -1/+1 |
| | |||||
* | config.force_ssl should mark the session as secure. | José Valim | 2012-01-13 | 2 | -0/+33 |
| | |||||
* | Merge pull request #4451 from guilleiguaran/add-therubyracer-commented | José Valim | 2012-01-13 | 2 | -6/+16 |
| | |||||
* | Update Railties section of 3.2 release notes | Guillermo Iguaran | 2012-01-13 | 1 | -1/+3 |
| | |||||
* | warns against using temporary subscribers | Xavier Noria | 2012-01-12 | 1 | -0/+4 |
| | |||||
* | fix rails binary path when using --dev [ci skip] | Vijay Dev | 2012-01-13 | 2 | -2/+2 |
| | |||||
* | Added note about [ci skip] tag to contributing guide | Piotr Sarnacki | 2012-01-12 | 1 | -0/+2 |
| | |||||
* | add info about kindle guides in the release guide [ci skip] | Vijay Dev | 2012-01-13 | 1 | -0/+4 |
| | |||||
* | Fix table_name in ActiveRecord with more than one abstract ancestors | Piotr Sarnacki | 2012-01-12 | 2 | -3/+18 |
| | | | | | | | | | | | | | | | | | When subclassing abstract_class table_name should be always computed based on class name, no matter if superclass is subclassing base or another abstract_class. So: class FirstAbstract < ActiveRecord::Base self.abstract_class = true end class SecondAbstract < FirstAbstract self.abstract_class = true end class Post < SecondAbstract self.table_name #=> 'posts' (not 'second_abstracts') end | ||||
* | prepare for 3.2 guides release :) | Vijay Dev | 2012-01-13 | 1 | -1/+1 |
| | |||||
* | remove hidden link in guides layout | Vijay Dev | 2012-01-13 | 1 | -1/+0 |
| | |||||
* | moving to arel 3.0.0 | Aaron Patterson | 2012-01-12 | 1 | -1/+1 |
| | |||||
* | depend on journey 1.0.0 | Aaron Patterson | 2012-01-12 | 1 | -1/+1 |
| | |||||
* | add 3.2 release notes to the guides index | Vijay Dev | 2012-01-13 | 1 | -0/+4 |
| | |||||
* | minor edits | Vijay Dev | 2012-01-13 | 2 | -2/+2 |
| | |||||
* | fixes in api docs | Vijay Dev | 2012-01-13 | 5 | -7/+7 |
| | |||||
* | minor revision in 3.2 release guide | Vijay Dev | 2012-01-13 | 1 | -1/+1 |
| | |||||
* | Add CHANGELOG entry | Santiago Pastorino | 2012-01-11 | 2 | -0/+5 |
| | |||||
* | on and ON are type casted to a true boolean column | Santiago Pastorino | 2012-01-11 | 2 | -2/+31 |
| | |||||
* | add some missing formats in the release guide | Vijay Dev | 2012-01-11 | 1 | -5/+5 |
| | |||||
* | Merge pull request #4412 from kennyj/fix_3743 | Santiago Pastorino | 2012-01-11 | 1 | -0/+2 |
| | | | | Fix GH #3743. We must specify an encoding in rdoc_option explicitly. | ||||
* | Some revisions to the release notes guide | Vijay Dev | 2012-01-11 | 1 | -13/+13 |
| | | | | | | Conflicts: railties/guides/source/3_2_release_notes.textile | ||||
* | add documentation explaining reorder behavior | Matt Jones | 2012-01-11 | 1 | -0/+10 |
| | |||||
* | Made an example a little more realistic | codesnik | 2012-01-11 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4408 from tomstuart/read-and-write-attribute-aliases | Santiago Pastorino | 2012-01-11 | 2 | -5/+46 |
| | | | | #[] and #[]= are no longer interchangeable with #read_attribute and #write_attribute | ||||
* | Merge pull request #4404 from rizwanreza/edits-to-spastorino-upgrade-notes | Santiago Pastorino | 2012-01-11 | 1 | -11/+8 |
|\ | | | | | Edits to spastorino's upgrade notes | ||||
| * | Edits to spastorino's additions in 3.2 Release Notes | Rizwan Reza | 2012-01-11 | 1 | -11/+8 |
|/ |