Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
This comparison is big! We’re only showing the most recent 250 commits
Commits on Dec 18, 2011
@josevalim josevalim Merge pull request #4018 from arunagw/warning_removed_
Warning removed in test
1214e16
@jonleighton jonleighton Merge pull request #4011 from lest/scope-with-lambda-duplicates
call scope within unscoped to prevent duplication of where values
81c67c1
@jonleighton jonleighton Merge pull request #4014 from lest/bypass-preloading-for-ids-reader
bypass preloading for ids_reader
de2306f
@kommen kommen Rename STRUCTURE to DB_STRUCTURE, update dump task description and ad…
…d simple testcase.
a2249ee
@josevalim josevalim Merge pull request #4019 from kommen/rake_db_structure
Make structure.sql file configureable in db:structure:dump analog to SCHEMA in db:schema:dump
81deb34
@josevalim josevalim Update activerecord/lib/active_record/railties/databases.rake e8d6943
@vijaydev vijaydev fix a minor typo c59409b
@jonleighton jonleighton Don't notify campfire when the build keeps passing 4012fcf
Commits on Dec 19, 2011
@Juanmcuello Juanmcuello Fix database tasks in test namespace. 876bade
@josevalim josevalim Merge pull request #4030 from Juanmcuello/database_tasks
Fix database tasks in test namespace.
a0edfb4
@josevalim josevalim Revert "Merge pull request #4030 from Juanmcuello/database_tasks"
This reverts commit a0edfb4, reversing
changes made to 4012fcf.
3c1884e
@nashby nashby add failing tests for issue #3487 024d3b9
@Juanmcuello Juanmcuello Fix database tasks in test namespace.
This is mostly the same as 876bade
that was reverted due to test failures, but now with a correction.
626c881
@tenderlove tenderlove adding tests for #4029 9d0789c
@drogus drogus Merge pull request #4036 from Juanmcuello/database_tasks
Fix database tasks in test namespace.
61d0de2
Commits on Dec 20, 2011
@dhh dhh Add an invitation to use jbuilder, since we are not going to bundle i…
…t in 3.2
1e941dd
@dhh dhh Party like its R-C-UNO! 9d6e52b
@josevalim josevalim Remove i18n dependencies from AP and AMo since they are in AS. 5d91364
Xu Pan don't encode an UTF-8 encoded template
Signed-off-by: José Valim <jose.valim@gmail.com>
1897be9
@josevalim josevalim Do not hard code encoding to UTF8 2e0050c
@josevalim josevalim Check if source is encoding aware. 2305a98
@lest lest remove warnings about @variable_for_layout
Signed-off-by: José Valim <jose.valim@gmail.com>
e97aa2c
@josevalim josevalim Add a test case for layout nil. f29b4a0
@josevalim josevalim Depend on 3-2-stable. 51e8adb
@htanata htanata Improve doc for ActiveRecord::Base.unscoped. e149d50
@atambo atambo Fix reference to old :sql schema_format location
After 15fb430 the default location of the :sql schema_format location was
changed from environment_name.sql to structure.sql. This pull request updates
a reference to the old schema format location in the migration guides.
fec2999
@nashby nashby fix adding field_with_errors to date selects, closes #3487 9208813
@josevalim josevalim Merge pull request #4064 from nashby/date-helper-field-error-proc
fix adding field_with_errors to date selects, closes #3487
437f1e0
@arunagw arunagw It should be README.rdoc fixes #4067 490c00b
@spastorino spastorino Merge pull request #4069 from arunagw/issue_4067
It should be README.rdoc
cf2d31a
@heimidal heimidal Ensure option for select helper responds to `#first` before comparison. bd89946
@heimidal heimidal Check for response to `#last` instead of `#first`. a1b2dbd
@josevalim josevalim Merge pull request #4080 from heimidal/3-2-stable
Fix regression in select form helper when options are non-string values
a2f5df5
Commits on Dec 21, 2011
@htanata htanata Doc fixes on Rails::Generators::Base.hook_for. efb75f7
@jeremy jeremy Rails::SubTestTask warns on test failure and moves on. Renamed from T…
…estTaskWithoutDescription.

This makes it easier to add your own tests to the default suite:

  namespace :test do
    task run: 'test:acceptance'

    Rails::SubTestTask.new acceptance: 'test:prepare' do |t|
      t.libs << 'test'
      t.pattern = 'test/acceptance/**/*_test.rb'
    end
  end

Now `rake` runs unit, functional, integration, and acceptance tests.
e854848
@tenderlove tenderlove caches should not be global, so no need to clear in the teardown 79778ff
@tenderlove tenderlove adding integration test for journey #7 d5ccb5c
@jeremy jeremy Move SubTestTask. Soften up tests. 108e344
@qoobaa qoobaa added failing tests for has_many, has_one and belongs_to associations…
… with strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051

Signed-off-by: José Valim <jose.valim@gmail.com>
2d07c60
@lucasmazza lucasmazza raises an ArgumentError if no valid options are given to TemplateRend…
…erer#determine_template

Signed-off-by: José Valim <jose.valim@gmail.com>
b5bb3f8
@tenderlove tenderlove append puts the routes after the default, which causes a 404. instead…
… use prepend
476dce4
@tenderlove tenderlove just require things once 1945baf
Commits on Dec 22, 2011
@arunagw arunagw [docs] added missing "}" fixes #4126 8dc8926
@drogus drogus Merge pull request #4128 from arunagw/doc_fixes_3_2-stable
Doc fixes 3 2 stable
278a72e
@tenderlove tenderlove Revert "Added Enumerable#pluck to wrap the common pattern of collect(…
…&:method) *DHH*"

This reverts commit 4d20de8.
c0563ce
@tenderlove tenderlove Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable
* '3-2-stable' of github.com:rails/rails:
  [docs] added missing "}" fixes #4126
89e2647
@jonleighton jonleighton Make read_attribute code path accessible at the class level 7edade3
@jonleighton jonleighton Make ActiveRecord::Relation#pluck work with serialized attributes e46e491
@tenderlove tenderlove refactoring routing tests 585e291
@spastorino spastorino Use sass-rails >= 3.2.2 for new apps 6758941
@tenderlove tenderlove rack bodies should be a list 2bc3f81
@tenderlove tenderlove Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable
* '3-2-stable' of github.com:rails/rails:
  Use sass-rails >= 3.2.2 for new apps
  Make ActiveRecord::Relation#pluck work with serialized attributes
  Make read_attribute code path accessible at the class level
f2e65b7
Commits on Dec 23, 2011
@tenderlove tenderlove Adding an integration test. Fixes #4136 a32d3d0
@tenderlove tenderlove adding an integration test for splat regexp substitutions. fixes #4138 5f2bfce
@jonleighton jonleighton Fix build when IM=true 96c38ec
@josevalim josevalim Merge pull request #4141 from arunagw/fix_build
Fix build 3-2-stable
35ded6f
@fxn fxn removes Enumerable#pluck from the AS guide 824334c
@alvarobp alvarobp serialize fails on subclass 6b9ab88
@jonleighton jonleighton Fix #4046. 7bb754e
@jonleighton jonleighton Doh, remove debugging line 9d9440f
@vijaydev vijaydev Rails 3.2 Release Notes 4a86708
@jonleighton jonleighton Fix situation where id method didn't get defined causing postgres to …
…fail
0a2e379
Commits on Dec 24, 2011
@jeremy jeremy Remove broken #compute_source_path 684448b
@ai ai Gzip files on page caching
Signed-off-by: José Valim <jose.valim@gmail.com>
754823d
@josevalim josevalim Provide a class optin for page_cache_compression. ba86892
@josevalim josevalim Remove unecessary config_accessors. c4ef3d3
@german german added ability to specify from cli when generating a model/migration w…
…hether particular property should be an index like this 'rails g model person name:string:index profile:string'
7f5b516
@josevalim josevalim Tidy up migration types. 557014d
@josevalim josevalim Update CHANGELOGs. fc42998
@josevalim josevalim Fix regexp intervals. 1db5f4e
@vijaydev vijaydev minor edits in caching guide 853439c
@vijaydev vijaydev add latest changes to 3.2 release notes 929bfb8
@josevalim josevalim assert_not_match -> assert_no_match. 0e8cbbe
@tenderlove tenderlove delegating and deprecating logger#silence. fixes #4159 b590fe4
@tenderlove tenderlove avoid deprecation warnings when running AR tests a410a9c
@josevalim josevalim Last attempt to fix 1.8.7 tests. bea3524
Commits on Dec 25, 2011
@fxn fxn (draft) guides for the Kindle and Kindle apps [Mip Earson & Xavier No…
…ria]
69cc645
@kuroda kuroda Reconnect to the first database after db:create
Otherwise, the schema and seed will be loaded onto the
test database.
38bc917
@tenderlove tenderlove Merge pull request #4175 from kuroda/3-2-stable
Reconnect to the first database after db:create
0daf80a
@fxn fxn guides generation for the Kindle looking good now [Mip Earson & Xavie…
…r Noria]
4ae1cdd
@fxn fxn download guides for the Kindle and Kindle apps from the home page d6d561e
@fxn fxn registers guide generation for the Kindle and Kindle apps in the Chan…
…gelog
7ec8473
@mipearson mipearson Mip Earson -> Michael Pearson in changelog. 51fd3f3
@vijaydev vijaydev fix kindle apps link in edge guides index 7a3121b
@vijaydev vijaydev Some fixes in rails guides generation
* Passing edge information to the views fixes the lack of the edge badge
and sets the appropriate welcome page on edgeguides.rubyonrails.org.
* Changes in the welcome message to hyper link the rails tree based on
the version.
* Mention the Amazon url from where kindlegen can be downloaded.
68564eb
@vijaydev vijaydev add back the version info to the title in guides index page 4cf40d0
Commits on Dec 26, 2011
@drogus drogus Correctly display rack apps with dynamic constraints in RoutesInspector
If you used dynamic constraint like that:

  scope :constraint => MyConstraint.new do
    mount RackApp => "/foo"
  end

routes were not displayed correctly when using `rake routes`.
This commit fixes it. If you want nice display of dynamic
constraints in `rake routes` output, please just override
to_s method in your constraint's class.
d7cfb63
Commits on Dec 27, 2011
@gazay gazay Safe getting value from cache entry f7b1906
@tapajos tapajos Closes #4208 b3490d8
Commits on Dec 28, 2011
@josevalim josevalim Merge pull request #4210 from tapajos/patch-1
Fix #4208
d547761
@tapajos tapajos Remove empty line. 7767159
@fxn fxn Merge pull request #4217 from tapajos/patch-2
Remove empty line
40cab62
@bensie bensie Further simplify singleton_class checking in class_attribute 520918a
@spastorino spastorino Bump to rack 1.4.0 2004a13
@spastorino spastorino Add CHANGELOG entry a0fd9fb
@tenderlove tenderlove Merge pull request #4196 from gazay/3-2-stable-marshalling
3.2 stable marshalling
df37018
@jonleighton jonleighton Revert "Further simplify singleton_class checking in class_attribute"
This reverts commit 520918a.

Reason: build failure
bbafe73
@fxn fxn app code in general wants Time.current, not Time.now 7a80ac0
Commits on Dec 29, 2011
@tenderlove tenderlove last named route wins. fixes #4164
This differs from route recognition where first recognized route wins.
This will not be supported in Rails 4.0 so that route recognition and
generation rules are consistent.
50af25b
@tenderlove tenderlove Revert "Merge pull request #4196 from gazay/3-2-stable-marshalling"
This reverts commit df37018, reversing
changes made to a0fd9fb.
80f2eeb
@tenderlove tenderlove Merge pull request #4216 from edgecase/master_fix_reorder_with_limite…
…d_ids

allow reorder to affect eager loading correctly
f423bdc
@gazay gazay Backward compatibility with 3.1 cache storing b815676
@ugisozols ugisozols Remove unnecessary comma. bea4f9a
@joliss joliss Document that index names are made up of all columns, not just the fi…
…rst.

index_name has been using the following expression

    "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}"

since at least 2006 (bc7f231), and that's how they come out in my DB.

Please check that this is correct before merging into master, perhaps
I'm misunderstanding the section I changed.
d8a43e2
@fuzzyalej fuzzyalej Fixed formatting of code examples in form_tag_helper.rb 5f57d2a
@kevmoo kevmoo Documented about using :path option for resources 2e533e3
@vijaydev vijaydev revise some doc changes 63c6fee
@tenderlove tenderlove fixing typo. Thanks Vijay! 766eda3
Commits on Dec 30, 2011
@lest lest refactor Range#include? to handle ranges with floats
Conflicts:

	activesupport/lib/active_support/core_ext/range/include_range.rb
71f59b7
@fxn fxn adds a comments that clarifies why Range#include? chooses the compari…
…son operator
0814e74
@tenderlove tenderlove Merge pull request #4227 from gazay/3-2-stable-marshalling
3 2 stable marshalling
f12d904
Commits on Dec 31, 2011
@vijaydev vijaydev remove wiki link 0a048f3
@vijaydev vijaydev fix a couple of formatting issues ba19837
@sumbach sumbach Minor readability improvements 003d0ff
@sumbach sumbach SCSS processor is provided by the sass gem 95a83cc
@fuzzyalej fuzzyalej Fixed documentation error in code examples from form_tag_helper.rb 8be9d92
Commits on Jan 01, 2012
@vijaydev vijaydev DRY up guides index page
Use the list of guides available in documents.yaml to fill in the
menu in the index page instead of duplicating the list again. Also,
remove WIP guides from the menu.
6e9cd38
Commits on Jan 02, 2012
@lest lest deprecate ActiveSupport::Base64
extend and define ::Base64 if needed
5f09414
@fxn fxn Merge pull request #4267 from lest/3-2-deprecate-activesupport-base64
deprecate ActiveSupport::Base64
7bdfbac
@lest lest fix base64 requires 4f440a3
@fxn fxn Merge pull request #4268 from lest/3-2-deprecate-activesupport-base64
fix base64 requires
e369c4e
Commits on Jan 03, 2012
@lest lest use pg 0.11.0 under ruby 1.8.7 0b5cda7
@josevalim josevalim Merge pull request #4273 from lest/fix-pg-version
use pg 0.11.0 under ruby 1.8.7
2535898
@spastorino spastorino Deprecate Rails::Plugin in favor of gems 853de2b
@lest lest deprecate AS::Base64 methods without DeprecatedConstantProxy 1fc53df
@josevalim josevalim Merge pull request #4275 from lest/3-2-deprecate-activesupport-base64
deprecate AS::Base64 methods without DeprecatedConstantProxy
c032ff6
@spastorino spastorino Merge pull request #4278 from kennyj/fix_rdoc_generating_problem
Use -e option instead of -c option (rake rdoc task).
ca24ee7
@tenderlove tenderlove Merge pull request #4279 from lest/fix-log
do not rewrite log during application bootstrap
eafdf6c
@spastorino spastorino Add font_path helper method 0d7d3a6
@bogdan bogdan AS::Callbacks: improve __define_runner perfomance 9f8f4c2
@bogdan bogdan AS::Callbacks: improved __define_runner performance 4e8286f
@bogdan bogdan Refactor AS::Callbacks
Extracted `__reset_runner` from `__define_runner`
And call it in proper places
5b8d270
@bogdan bogdan AS::Callbacks: remove __define_runner 40c8aa7
@josevalim josevalim Override respond_to? since we are also overriding method_missing. d38dac8
@josevalim josevalim Merge pull request #4280 from lest/3-2-backport-callbacks
backport changes in AS::Callbacks
124536e
@spastorino spastorino Pass extensions to javascript_path and stylesheet_path helpers. Closes 8c129f1
@lest lest add CHANGELOG entry for AS::Base64 deprecation 337ac05
@spastorino spastorino Merge pull request #4281 from lest/3-2-changelog
add CHANGELOG entry for AS::Base64 deprecation
caa6cde
@tenderlove tenderlove Merge pull request #4283 from lest/fix-singleton-checking
use correct variant of checking whether class is a singleton
c4a29de
@tenderlove tenderlove Revert "Named Routes shouldn't override existing ones (currently rout…
…e recognition goes with the earliest match, named routes use the latest match)"

This reverts commit 71d769e.
e912211
@tenderlove tenderlove When generating routes, the last defined named route wins. This is in
contrast to route recognition where the first recognized route wins.
This behavior will not exist in Rails 4.0.

See:

  #4245
  #4164
63f7a61
Commits on Jan 04, 2012
@kennyj kennyj Fix GH #4285. Remove options when we record calling creat_table 6012970
@josevalim josevalim Merge pull request #4288 from kennyj/fix_4285-2
(3-2-stable) Fix GH #4285. Remove options when we record calling create_table
a10f309
@imkmf imkmf Final grammar checkup on 3.2 release notes. 6bcc1b8
@vijaydev vijaydev updates to 3.2 release notes bc36613
@ffmike ffmike General editing pass over assets pipeline guide 20a4258
@elpic elpic improve doc in number helper options 00a27c5
@vijaydev vijaydev copy edits 4b2b595
@spastorino spastorino Revert "use pg 0.11.0 under ruby 1.8.7"
There's a new pg release, no need for this anymore
This reverts commit 0b5cda7.
3fb32cf
@spastorino spastorino Use sass-rails 3.2.3 f8df37b
@tenderlove tenderlove Merge pull request #4282 from edgecase/order_after_reorder
correctly handle order calls after a reorder
d22592a
@jeremy jeremy Clarify vendor/plugins deprecation warning d9e0c4a
@jeremy jeremy Add release notes URL to vendor/plugins deprecation warning. Update C…
…HANGELOG.
49a1017
@josevalim josevalim Revert "AS::Callbacks: remove __define_runner"
Runners are used internally.

This reverts commit 40c8aa7.
0b24dc9
@spastorino spastorino Bump to rc2 d268ef2
Commits on Jan 05, 2012
@kuroda kuroda Infer currency negative format from positive one.
When a locale file sets the format of the positive
currency value as '%n %u', the default negative
currency format should be '-%n %u'.

Cherry-picked from master (6724c8c)
22f901c
@tenderlove tenderlove Merge pull request #4311 from kuroda/3-2-negative_format
Infer currency negative format from positive one. (3-2-stable)
867a792
@spastorino spastorino Depend on coffee-rails 3.2.1 6005736
Commits on Jan 06, 2012
@kennyj kennyj Don't fork a process when assets:precompile:nondigest is invoked in a…
…ssets:precompile:all. Improve GH #3694.
2056744
@josevalim josevalim Merge pull request #4352 from kennyj/improve_3694-2
[3-2-stable] Don't fork a process when assets:precompile:nondigest is invoked in assets:precompile:all.
a579d4b
Commits on Jan 10, 2012
@drogus drogus Add ORIGINAL_FULLPATH to env
This behaves similarly to REQUEST_URI, but
we need to implement it on our own because
REQUEST_URI is not reliable.

Note that since PATH_INFO does not contain
information about trailing question mark,
this is not 100% accurate, for example
`/foo?` will result in `/foo` in ORIGINAL_FULLPATH
63305da
@drogus drogus Add original_fullpath and original_url methods to Request 79b12a0
@drogus drogus Fix http digest authentication with trailing '/' or '?' (fixes #4038
…and #3228)
d65b766
@spastorino spastorino Rails initialization with initialize_on_precompile = false should set…
… assets_dir
3375a09
@spastorino spastorino Add CHANGELOG entry 6f48fb3
@spastorino spastorino Remove dead code bda0ae7
@josevalim josevalim Remove duplicated test line which was causing Ci failures on 1.8.7. ae14b71
@spastorino spastorino Add "What to update in your apps" section to the release notes guide
We should keep this up to date and the current version is probably wrong
and/or incomplete. HELP!!!
03f6275
@tenderlove tenderlove deprecate the subdirectories parameter to `migrations`
Conflicts:

	activerecord/lib/active_record/migration.rb
5e04884
@tenderlove tenderlove FFFFFFFFUUUUUUUUUUUUUUUUUUUUUUUUU :bomb: 77785c7
Commits on Jan 11, 2012
@rizwanreza rizwanreza Edits to spastorino's additions in 3.2 Release Notes 7be7710
@spastorino spastorino Merge pull request #4404 from rizwanreza/edits-to-spastorino-upgrade-…
…notes

Edits to spastorino's upgrade notes
9c88005
@spastorino spastorino Merge pull request #4408 from tomstuart/read-and-write-attribute-aliases
#[] and #[]= are no longer interchangeable with #read_attribute and #write_attribute
bb78804
@codesnik codesnik Made an example a little more realistic 96d4da1
@al2o3cr al2o3cr add documentation explaining reorder behavior d0915ac
@vijaydev vijaydev Some revisions to the release notes guide
Conflicts:

	railties/guides/source/3_2_release_notes.textile
2609990
@spastorino spastorino Merge pull request #4412 from kennyj/fix_3743
Fix GH #3743. We must specify an encoding in rdoc_option explicitly.
9e94e26
@vijaydev vijaydev add some missing formats in the release guide ffc8e59
Commits on Jan 12, 2012
@spastorino spastorino on and ON are type casted to a true boolean column fc74a51
@spastorino spastorino Add CHANGELOG entry 3f16f5b
@vijaydev vijaydev minor revision in 3.2 release guide 8ff8ca7
@vijaydev vijaydev fixes in api docs e6b5943
@vijaydev vijaydev minor edits 03a7198
@vijaydev vijaydev add 3.2 release notes to the guides index 040c9e4
@tenderlove tenderlove depend on journey 1.0.0 6dac17f
@tenderlove tenderlove moving to arel 3.0.0 1d74af6
@vijaydev vijaydev remove hidden link in guides layout ddfd2cf
@vijaydev vijaydev prepare for 3.2 guides release :) ac153fe
@drogus drogus Fix table_name in ActiveRecord with more than one abstract ancestors
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
0d1df72
@vijaydev vijaydev add info about kindle guides in the release guide [ci skip] e4c7ebe
@drogus drogus Added note about [ci skip] tag to contributing guide a6dce45
@vijaydev vijaydev fix rails binary path when using --dev [ci skip] 700f778
@fxn fxn warns against using temporary subscribers 01c1127
Commits on Jan 13, 2012
@guilleiguaran guilleiguaran Update Railties section of 3.2 release notes 05367e6
@josevalim josevalim Merge pull request #4451 from guilleiguaran/add-therubyracer-commented 70631e7
@josevalim josevalim config.force_ssl should mark the session as secure. b745fe1
@josevalim josevalim No AS::TestCase here. 4ca3592
@spastorino spastorino Use a BodyProxy instead of including a Module that responds to close.
Closes #4441 if Active Record is disabled assets are delivered correctly
c159b01
@jonleighton jonleighton Fix race condition :bomb: 70b762d
Commits on Jan 14, 2012
@josevalim josevalim Add begin/ensure block since we are returning. 78ef738
Commits on Jan 15, 2012
@semaperepelitsa semaperepelitsa Pass a symbol instead of a block. This is faster and more concise.
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)
```
d696f8d
@tenderlove tenderlove Merge pull request #4471 from semaperepelitsa/enum_sum
Pass a symbol instead of a block in Enumerable#sum
fce3afa
@mikel mikel Upgrade mail dependency to 2.4.0 95027d2
@drogus drogus Fix stack level too deep when model does not have attributes method.
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`.
dee595c
@guilleiguaran guilleiguaran Don't hardcode assets route skipped in route inspector
Conflicts:

	railties/lib/rails/application/route_inspector.rb
666f931
@josevalim josevalim Merge pull request #4474 from guilleiguaran/fix-route-inspector-3-2-s…
…table

Don't hardcode assets route skipped in route inspector (3-2-stable)
4215935
Commits on Jan 16, 2012
@drogus drogus Add ActiveModel::Errors#delete, which was not available after move to…
… use delegation
3430647
@guilleiguaran guilleiguaran Getting Started Guide: Update reference about JavaScript runtimes 30782e4
@carlosantoniodasilva carlosantoniodasilva Improve description of :allow_destroy option for nested attributes in…
… getting started guide
7b8e6d5
Dan Pickett change class to id per scaffold change 951d70d
@rhulse rhulse [docs] Update pipeline asset organization section.
* Calified how assets are included.
* Added information about using index manifests.
96e5d10
@vijaydev vijaydev copy editing asset pipeline changes 39d4878
@vijaydev vijaydev minor edits in getting started guide 48f9835
@drogus drogus Apparently asssert_empty is not available in 1.8.7 90aae07
@tenderlove tenderlove Merge pull request #4462 from spohlenz/fix-routing-tests
Stub ip method of alternative request class in router tests
f9275e5
Commits on Jan 17, 2012
@pkondzior pkondzior Fix ActiveModel::Errors#dup
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.
7021184
@drogus drogus Merge pull request #4492 from pkondzior/3-2-stable
Wrong behavior of ActiveModel::Errors#dup is causing regressions on applications using Rails 3-2-stable
ed35f37
@rafaelfranca rafaelfranca Add option to configure Sprockets logger c4c6beb
@josevalim josevalim Merge pull request #4501 from rafaelfranca/assets-logger-3-2
Add option to configure Sprockets logger [3-2-stable]
5812c35
@tenderlove tenderlove Merge pull request #4487 from sarenji/fix-reset-counters
Fix bug where reset_counters resets the wrong counter cache.
57f73a6
@carlosantoniodasilva carlosantoniodasilva Add some deprecations for logic being removed in 4.0 20baeec
@carlosantoniodasilva carlosantoniodasilva Deprecate default_charset= at controller level 57be2cf
@carlosantoniodasilva carlosantoniodasilva Add default charset config to ActionDispatch 9d4fd61
@carlosantoniodasilva carlosantoniodasilva Deprecate AC::UnknownError and AC::DoubleRenderError
Use the constants AbstractController::ActionNotFound and
AbstractController::DoubleRenderError respectively instead.
e5e8704
@carlosantoniodasilva carlosantoniodasilva Remove duplicated constant definition
ActionController::ActionControllerError is already defined in
action_controller/metal/exceptions.
786a0b7
@carlosantoniodasilva carlosantoniodasilva Update changelog ed0f0ad
@josevalim josevalim Merge pull request #4498 from carlosantoniodasilva/action-controller-…
…refactor-3-2

Action controller refactor - deprecate Compatibility module
2f52bd3
Commits on Jan 18, 2012
@guilleiguaran guilleiguaran Silent Sprockets logger when config.assets.logger is set to false 02e4d7f
@guilleiguaran guilleiguaran Update CHANGELOG and docs for config.assets.logger ae7037e
@josevalim josevalim Merge pull request #4518 from guilleiguaran/silent-sprockets-logger-3…
…-2-stable

Silent Sprockets logger when config.assets.logger is set to false (3-2-stable)
f74afd9
@vijaydev vijaydev updates to 3.2 release notes 0960eb9
@guilleiguaran guilleiguaran Update AM CHANGELOG 939a84a
@makoto makoto ActionController::UrlEncodedPairParser is deprecated. Replaced the ur… 619731f
@vijaydev vijaydev Merge pull request #4525 from guilleiguaran/am-changelog-3-2-stable
Update AM CHANGELOG
f2af2ac
@guilleiguaran guilleiguaran Update Release Notes: sprockets-rails section should be inside of Act…
…ionPack section
6838549
@guilleiguaran guilleiguaran Adding Action Mailer section to 3.2 release notes 3bfbc45
@vijaydev vijaydev revise wording [ci skip] 2e6ca53
Commits on Jan 19, 2012
@vijaydev vijaydev select doesn't take multiple arguments - fixes #4539 [ci skip]
Didn't cherry pick the master commit because this one already had some
of the fixes made in master.
c8b584f
@fujimura fujimura update release note: timestamps is non-null as default ead04ee
@vijaydev vijaydev revising release notes [ci skip] c450833
@simonbaird simonbaird Fix small typo in mail_to docs in url_helper.rb 0055456
@tenderlove tenderlove Merge pull request #4531 from exviva/pessimistic_with_lock
Add ActiveRecord::Base#with_lock
4c5b73f
@vijaydev vijaydev update the getting_started guide code [ci skip] 6e311b9
@vijaydev vijaydev document AR::Base#with_lock in release notes [ci skip] a0e439f
@vijaydev vijaydev fix duplicate ids for the headers [ci skip] b259bf9
@vijaydev vijaydev add uglifier version info in the 'what to update' section ff813dc
@josevalim josevalim Do not deprecate performed? 08d6eb6
@josevalim josevalim Update CHANGELOG 5b90635
@vijaydev vijaydev update release notes [ci skip] 6c65676
Commits on Jan 20, 2012
@dhh dhh Preparing for 3.2.0 release f36dcaf