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
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Jan 05, 2012
@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
@jonleighton jonleighton Fix another race condition.
From 2c667f6.

Thanks @pwnall for the heads-up.

Conflicts:

	activerecord/lib/active_record/core.rb
fab664a
Commits on Jan 21, 2012
Jonathan Roes document `:raise` option support for several helpers [ci skip] c701358
@kennyj kennyj Fix GH #4580. Rails 3.2: uninitialized constant ActiveSupport::Tagged…
…Logging::ERROR
caf7856
@josevalim josevalim Merge pull request #4582 from kennyj/fix_4580
Fix  GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR
a720e34
@waseem waseem Remove deprecation warning from console output when running
activesupport tests.
892c670
@josevalim josevalim Merge pull request #4586 from waseem/assert_with_no_deprecation_warnings
Assert with no deprecation warnings activesupport tests.
d5dde37
Commits on Jan 22, 2012
@jviney jviney Fix `$rails_rake_task` global variable warning without replacing the …
…value of $rails_rake_task if it is already set.

Fixes #4591.

Signed-off-by: José Valim <jose.valim@gmail.com>
9ab2904
@carlosantoniodasilva carlosantoniodasilva Add missing require to Array#wrap in generators action methods d246da1
@iHiD iHiD Allow form.select to accept ranges. c6dcc35
@josevalim josevalim Merge pull request #4604 from ihid/3-2-stable
3-2-stable: Fixed regression - unable to use a range as choices for form.select.
334e5ca
@josevalim josevalim Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fi…
…ne with bash, zsh, etc, closes #4602
ede01ce
Commits on Jan 23, 2012
@jviney jviney The deprecated ActiveSupport::Base64.decode64 method should call ::Ba…
…se64.decode64 not ::Base64.encode64
44319ef
@vijaydev vijaydev Merge pull request #4611 from jviney/3-2-stable
Fix ActiveSupport::Base64.decode64
70d81b3
@vijaydev vijaydev test base64 encode and decode 912f144
@josevalim josevalim Merge pull request #4601 from carlosantoniodasilva/patch-1
Add missing require to Array#wrap in generators action methods
b840461
Commits on Jan 24, 2012
@tenderlove tenderlove Added custom regexps to ASTs that have literal nodes on either side of
symbol nodes.  Fixes #4585
3913b51
@tenderlove tenderlove work against 1-0-stable until a new journey is released 1a56a76
@kennyj kennyj Fix GH #4344. A defined callback in extended module is called too.
Conflicts:

	activesupport/test/callbacks_test.rb
dc826f9
@indrekj indrekj Add failing test for date_select
date_select does not work when day is discarded, include blank option is
enabled and struct date itself is nil.
d4cfc4c
@indrekj indrekj Fix date_select nil and blank and order case d92b5fe
@joevandyk joevandyk datetime_select should work with -/+ infinity dates 59a408e
@rafaelfranca rafaelfranca Fix date_select with discard_month and discard_year options
Closes #4553 and #4633
c4b7ca0
@tenderlove tenderlove Merge pull request #4514 from brainopia/update_timezone_offets
Update time zone offset information
e0fe62b
@josevalim josevalim Merge pull request #4641 from rafaelfranca/date_select-fix-3-2
date_select fixes [3-2-stable]
5a66d33
@rafaelfranca rafaelfranca Remove unused variables to avoid warnings 3cd28e2
@josevalim josevalim Merge pull request #4643 from rafaelfranca/3-2-stable
Remove unused variables to avoid warnings
dc81d00
@tenderlove tenderlove Merge pull request #4639 from joevandyk/datetime-infinity-select-fix
datetime_select fix for dates of -infinity and +infinity
1d67f1a
Commits on Jan 25, 2012
@pwim pwim allow requiring of 'active_model/naming'
Requiring 'active_model/naming' will raise an uninitialized constant
ActiveSupport::Deprecation exception because the module core extension
doesn't require 'active_support/deprecation'. This require cannot be
added to the core extension because of circular dependency issues.
75d58fe
@josevalim josevalim Merge pull request #4654 from pwim/explicit-deprecation-require
Explicit deprecation require
9e9e17a
@pwim pwim Test for unicode path support
This is currently broken due to a bug in journey.
22980e0
@tenderlove tenderlove Merge pull request #4658 from pwim/unicode-paths
Test for unicode path support
11e88a4
@damln damln example bracket error fd9d394
@rohit rohit remove extra 'the' a267090
@carlosantoniodasilva carlosantoniodasilva Fix custom validation methods section in AR validations and callbacks…
… guide

The methods validate_on_create and validate_on_update are not available
anymore in Rails, this removes them from the guide and adds an example
on how to use validate with the :on option.
6a85c45
@carlosantoniodasilva carlosantoniodasilva Change ActiveRecord::Errors to ActiveModel::Errors in guides
Use ActiveModel::Errors in inflection example docs as well.

Also fixes wrong information and link to locale file related to
Errors#full_messages in I18n guide.
eb171fa
@carlosantoniodasilva carlosantoniodasilva Improve field error proc example in validations guide 79a0488
@carlosantoniodasilva carlosantoniodasilva Fix callbacks order for destroying an object in validations guide
Also add around save to creating/updating callbacks order, and fix save
example with no validation
2d73f70
@lunks lunks Duping log handler. fixes #4668 c9cd0eb
@vijaydev vijaydev Merge pull request #4673 from carlosantoniodasilva/validation-guides-…
…update-3-2

Validation guides update 3 2
b023921
@tenderlove tenderlove Merge pull request #4675 from lunks/3-2-stable
Duping log handler on buffered logger silencer.
1a93eaa
Commits on Jan 26, 2012
@lest lest call to_s on value passed to table_name=
Signed-off-by: José Valim <jose.valim@gmail.com>
36d7af3
@brainopia brainopia Fix contributing guide to reflect preferred position on indentation 3a087b8
@fxn fxn disable automatic explain if there is no logger [closes #4671] 2483460
@fxn fxn registers 2483460 in the CHANGELOG 2809375
@rafaelfranca rafaelfranca Remove extra attributes from HABTM join tables in AR tests
HABTM Join tables should not have extra attributes

When extra attributes is needed in HABTM join tables is better to use
`has_many :through` association.

Fix #4653
06dcd9c
@tenderlove tenderlove global variables may not be set depending on the match. fixes #4703 7ba3ecc
@tenderlove tenderlove Merge pull request #4696 from rafaelfranca/issue-4653
Remove extra attributes from HABTM join tables in AR tests
5ac5acd
@tenderlove tenderlove bumping journey to 1.0.1 70cbb1c
@atambo atambo safe_constantize should handle wrong constant name NameErrors Fixes #…
…4710

Signed-off-by: José Valim <jose.valim@gmail.com>
6c367a0
@josevalim josevalim Revert usage of safe constantize
Signed-off-by: José Valim <jose.valim@gmail.com>
c134f24
@fxn fxn CHANGELOG revision for v3.2.1 97e8d1d
@fxn fxn updating RAILS_VERSION 67b8fbc
@fxn fxn fixes whitespace in CHANGELOG entries 8e6ef37
Commits on Jan 27, 2012
@jonleighton jonleighton Merge pull request #4715 from pwim/find-create-multi-args
Fix regression from Rails 3.1
1c5bd8a
Tadas Tamošauskas check_box helper with :disabled => true generates disabled hidden fie…
…ld. fixes #1953
19be5ea
@dmathieu dmathieu don't set the hidden checkbox value if it's nil defb751
@josevalim josevalim Merge check box fixes from remote-tracking branch 'cantonio/checkbox-…
…hidden-backport' into 3-2-stable
2e5ec3b
@dhh dhh Revert "Fix expanding cache key for single element arrays"
This reverts commit abe915f.

This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key.
66b445c
@dhh dhh Inline the prefix assignment so it doesnt look so daft f78cb55
Commits on Jan 30, 2012
@vijaydev vijaydev fix typo [ci skip] 766e12a
@fxn fxn query cache instrumentation should included the bindings in the paylo…
…ad [closes #4750]
4137905
Commits on Jan 31, 2012
@bsodmike bsodmike clarification to prevent confusing newbies; Passenger/Unicorn are app…
… servers, Apache/Nginx are the web servers along with thin a la Heroku etc.
93306be
@jonleighton jonleighton Merge pull request #4763 from kennyj/fix_4754
[MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
c472843
@jonleighton jonleighton Add workaround and deprecation if the inherited hook is not executed.…
… Closes #4757.
0bfc504
@jonleighton jonleighton Allow writing unknown attributes, but with a deprecation warning. Clo…
…ses #4583.
b2955ed
@lest lest fix assets test cfea673
@josevalim josevalim Merge pull request #4786 from lest/patch-2
fix assets test in 3-2-stable
175cdd1
@kennyj kennyj Fix GH #4760. A Block was not evaluated. 91700bf
@marten marten Fix use of Deprecation without requiring active_support/deprecation i…
…n ActiveSupport::Concern
cb46423
@marten marten Fix use of Deprecation without requiring active_support/deprecation i…
…n ActiveSupport::Concern in Base64
563be40
@marten marten Fix use of Deprecation without requiring active_support/deprecation i…
…n message verifier
f3e1b21
@marten marten Fix use of Deprecation without requiring active_support/deprecation i…
…n whiny nil
2380a2d
@josevalim josevalim Merge pull request #4790 from marten/fix-require-deprecation-in-activ…
…esupport

Fix Deprecation usage in ActiveSupport when requiring only parts of AS
7beb5a7
@jonleighton jonleighton Merge pull request #4783 from gregolsen/ids_reader_fix
ids_reader method fixed, test added to has_many association (for PostgreSQL)
85c724d
@josevalim josevalim Merge pull request #4793 from kennyj/fix_4760
[3-2-stable] Fix GH #4760. A Block was not evaluated.
bd93ba5
@tenderlove tenderlove Merge pull request #4779 from bsodmike/bsodmike-3-2-stable
Update comment in Gemfile re Unicorn (minor clarification)
60cb7d6
@tenderlove tenderlove Merge pull request #4735 from arton/master
Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows
81f14a5
@jonleighton jonleighton Improve deprecation message e1de540
Commits on Feb 01, 2012
@rafaelfranca rafaelfranca Fix broken tests added by 85c724d f532cd1
@spastorino spastorino Merge pull request #4811 from rafaelfranca/3-2-stable-fix
Fix broken build in 3-2-stable branch
1444ec6
@kennyj kennyj Fix GH #4749. Remove branch options, because edge is not 3-2-stable. c8c8439
@carlosantoniodasilva carlosantoniodasilva Generate strict validation error messages with attribute name
Backported from master.
91f8cf2
@spastorino spastorino Merge pull request #4815 from kennyj/fix_4749
Fix GH #4749. Remove branch options, because edge is not 3-2-stable.
21735d2
@josevalim josevalim Merge pull request #4822 from carlosantoniodasilva/strict-validation-3-2
Generate strict validation error messages with attribute name (3-2-stable)
0696a51
@sikachu sikachu Fix plugin_new test failure from c8c8439
`plugin_new` generator doesn't generate `sass-rails` in the Gemfile, so
you can't check for that.
b673ca6
@josevalim josevalim Merge pull request #4827 from sikachu/3-2-stable-fix-plugin-new
Fix plugin_new test failure from c8c8439
780bf52
@jonleighton jonleighton Merge pull request #4543 from jdelStrother/find_or_init
Don't instantiate two objects in collection proxy / find_or_instantiate_by
42dab64
Commits on Feb 02, 2012
@tenderlove tenderlove Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption
Fix for SQLite binary data corrupter (to master branch)
4ca633e
Commits on Feb 03, 2012
@skult skult Fix Issue #4819
'uninitialized constant ActiveRecord::Deprecation in Rails3.2.1'

Just a typo of 'ActiveSupport::...'
daa2665
@tenderlove tenderlove Merge pull request #4868 from skult/3-2-stable
Fix Issue #4819
9aa4c6d
@sikachu sikachu Fix override API response bug in respond_with
Default responder was only using the given respond block when user
requested for HTML format, or JSON/XML format with valid resource. This
fix the responder so that it will use the given block regardless of the
validity of the resource. Note that in this case you'll have to check
for object's validity by yourself in the controller.

Fixes #4796
567ac65
Commits on Feb 04, 2012
@fxn fxn let automatic EXPLAIN ignore CACHE notifications ee6e3c1
@josevalim josevalim Merge pull request #4879 from kennyj/fix_4873
Fix GH #4873. Allow swapping same class middleware.
9cb0e12
@josevalim josevalim Merge pull request #4870 from sikachu/3-2-stable-responder-fix
Fix override API response bug in respond_with
44b9992
@josevalim josevalim Clean up a bit default_response handling and cache format negotiation. 2bf2055
Commits on Feb 05, 2012
@kennyj kennyj GH #4883. Optional start_day argument for Time#all_week b037401
@spastorino spastorino Merge pull request #4890 from kennyj/improvement_4883
GH #4883. Optional start_day argument for Time#all_week
93f5361
Commits on Feb 06, 2012
@josevalim josevalim Merge pull request #4908 from kennyj/fix_3864
Fix url_for method's behavior. GH #3684.
ab44418
@guilleiguaran guilleiguaran Add branch to sass-rails and coffee-rails for apps generated with --d…
…ev or --edge options (3.2.x)
995c076
@tenderlove tenderlove Merge pull request #4912 from guilleiguaran/fix-edge-gemfile
Add branch to sass-rails and coffee-rails for apps generated with --dev or --edge (3-2-stable)
dd54137
@rmm5t rmm5t Fixed force_ssl redirects to include original query params
`ActionController.force_ssl` redirects http URLs to their https equivalent;
however, when a URL contains a query string, the resulting redirect lacked the
original query string.
391e6a4
Commits on Feb 07, 2012
@guilleiguaran guilleiguaran --edge option should generate app with rails 3-2-stable 5bfee55
@josevalim josevalim Merge pull request #4920 from guilleiguaran/revert-gemfile-edge
In Rails 3.2.x --edge generate apps with rails 3-2-stable
bc85fcb
@iblue iblue Fixed the documenation for 'to_xml' 8c7378a
@rmm5t rmm5t Added unit test to cover changes to RouteSet.url_for
ActionDispatch::Routing::RouteSet.url_for now handles passing params through to
ActionDispatch::Http::Url.url_for
0e482b3
@josevalim josevalim Merge pull request #4916 from rmm5t/fix_force_ssl_redirect_with_params
Fixed force_ssl redirects to include original query params
f3595b5
@fxn fxn no need to check for this constant dafc3c7
@tenderlove tenderlove always flush all logs. fixes #4277 b332877
@jonleighton jonleighton Fix attribute_before_type_cast for serialized attributes. Fixes #4837.
Conflicts:

	activerecord/lib/active_record/core.rb
77b4edc
Commits on Feb 08, 2012
@paul paul Handle nil in add_index :length option in MySQL
Our schema.rb is being generated with an `add_index` line similar to this:

    add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil}

This is the same as it was on Rails 3.1.3, however, now when that
schema.rb is evaluated, its generating bad SQL in MySQL:

    Mysql::Error: You have an error in your SQL syntax; check the manual
    that corresponds to your MySQL server version for the right syntax
    to use near '))' at line 1: CREATE UNIQUE INDEX
    `xxx` ON `foo` (`foo`(8), `bar`())

This commit adds a check for nil on the length attribute to prevent the
empty parens from being output.

Conflicts:

	activerecord/test/cases/migration/index_test.rb

Signed-off-by: José Valim <jose.valim@gmail.com>
0a75336
@josevalim josevalim Push proper test changes for previous commit conflicts. d3d807a
@rafaelfranca rafaelfranca Use real table and columns for index test 7c167dd
@josevalim josevalim Merge pull request #4941 from rafaelfranca/fix-build
Use real table and columns for index test
6d17b36
Commits on Feb 10, 2012
@tenderlove tenderlove Merge pull request #4988 from kennyj/fix_4720-3
Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
73fcbaa
@jeremy jeremy Fix that failed tests should exit with a nonzero error code.
Partially reverts 14c89e7.

Hat tip to @tenderlove for paring down the TestTask!
92acd5d
Commits on Feb 13, 2012
@josevalim josevalim Fix deprecation warning in AS::Concern. 305d5d5
Commits on Feb 14, 2012
@josevalim josevalim Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo
Always reenable _dump task in AR databases rake. Closes #5030
5f9a5a5
@spastorino spastorino Rack body respond to each and not to join
This fixes undef `to_str' for Rack::Chunked::Body when using
caches_action + streaming on an action

Closes #5027
7c79996
Commits on Feb 15, 2012
@tenderlove tenderlove adding tests to document behavior for #4817 201e67e
@josevalim josevalim Merge pull request #5049 from fabioyamate/master
Fix sanitize_for_mass_assigment when role is nil
a1b9acb
Commits on Feb 17, 2012
@arunagw arunagw Fixes failing test with ruby 1.8.7-p358
Same as 91a9b24
c17608f
@asanghi asanghi backporting #4918 to 3.2 stable; adding extra test for accept header …
…given by googlebot
dffd85a
@josevalim josevalim Merge pull request #5073 from asanghi/4918_backport
Backporting #4918 with one added test for googlebot accept header as I saw it
45503ec
@spastorino spastorino Merge pull request #5071 from arunagw/fix_failing_test_ruby187_p358
Fix failing test ruby187 p358
1a0bc2a
@pixeltrix pixeltrix Fix ActionDispatch::Static to serve files with unencoded PCHAR
RFC 3986[1] allows sub-delim characters in path segments unencoded,
however Rack::File requires them to be encoded so we use URI's
unescape method to leave them alone and then escape them again.

Also since the path gets passed to Dir[] we need to escape any glob
characters in the path.

[1]: http://www.ietf.org/rfc/rfc3986.txt
86d3bc3
@pixeltrix pixeltrix Simplify regexp 1b4e6ca
Commits on Feb 18, 2012
@arunagw arunagw fix test with ruby 187-p358 742b615
@fxn fxn Merge pull request #5081 from arunagw/fix_ar_test
Fix ar test
3b61efc
@avakhov avakhov Fix actionpack readme weblog example 168e653
@oestrich oestrich Update Time#change docs to reflect the options it uses
[ci skip]
ea54d2c
@lest lest fix spacer template example ed3a15d
@ffmike ffmike Documenting the :inverse_of option for associations 44849b1
@vijaydev vijaydev fix a typo [ci skip] b2e9bbd
Commits on Feb 20, 2012
@pixeltrix pixeltrix Remove fixture files with Windows incompatible filenames
Windows doesn't allow `\ / : * ? " < > |` in filenames so create
the fixture files at runtime and ignore the incompatible ones when
running on Windows.
41c182c
@funny-falcon funny-falcon sync __run_callbacks with ruby-trunk
https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580
In this revision behavior of respond_to? had changed: now to ask about
protected method one should pass second argument `true`
0c0f278
@tenderlove tenderlove search private / protected methods in trunk ruby 3b824d6
@ckdake ckdake Reset memoized hash keys when new entry added 68d3a46
@josevalim josevalim Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset
Reset memoized hash keys when new ActionView::Template handler is registered
8c870f1
@spastorino spastorino Use the right format when a partial is missing.
Closes #5025
8b86259
@spastorino spastorino Fix a failing test b80d8f7
Commits on Feb 21, 2012
@kennyj kennyj Fix some warnings on 3-2-stable 39d4617
@spastorino spastorino Merge pull request #5106 from kennyj/fix_warnings_20120210
[3-2-stable] Fix some warnings
c426591
@spastorino spastorino Add CHANGELOG entry b122968
@spastorino spastorino Restore lookup formats to the previous value after searching for the …
…failing view
4eff6bc
@tenderlove tenderlove Merge pull request #5096 from lawso017/master
Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys
d70ed10
@spastorino spastorino Don't wrap the raise with ensure f92c812
@vijaydev vijaydev fix bad docs from f373f29 [ci skip] cc848d6
@tenderlove tenderlove ruby 2.0 makes protected methods return false for respond_to, so pass…
… true as the second param
0052d90
@tenderlove tenderlove more ruby 2.0 respond_to? changes c73f883
@tenderlove tenderlove tag bind params with a bind param object a566ee5
Commits on Feb 22, 2012
@tenderlove tenderlove prepared statements can be disabled 83e42d5
@tenderlove tenderlove bumping up arel 35626fe
@spastorino spastorino format lookup for partials is derived from the format in which the te…
…mplate is being rendered

Closes #5025 part 2
19433ce
@spastorino spastorino Add CHANGELOG entry 110b43c
@spastorino spastorino Fix CHANGELOG 82d6ded
@tenderlove tenderlove updating RAILS_VERSION 4bcd437