Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: rails/rails
...
head fork: rails/rails
Commits on Apr 29, 2013
Rafael Mendonça França rafaelfranca Update CHANGELOGs with the release date fa39c8c
Commits on Apr 30, 2013
Francesco Rodríguez frodsan Fix guide section about assets precompiling task in production [ci skip]
You need to specify `RAILS_ENV=production`

Related to rails/sass-rails#152.

/cc @guilleiguaran
1847039
Francesco Rodríguez frodsan add missing :nodoc: marks to ActiveRecord::Delegation [ci skip] e876f71
Gaurish Sharma gaurish Rack::Mount was replaced by Journey, Fixed comment 91a38b0
Aaron Patterson tenderlove mysql needs to reconnect after recreate. Thanks @mperham 533402f
Xavier Noria fxn registers 56cdc81 in the changelog 367e7f3
Carlos Antonio da Silva carlosantoniodasilva Fix typos in deprecation proxy docs [ci skip] 55b0ad6
Chris Thompson cliochris Fix #8856 Ensure has_one association=(associate) triggers save.
activerecord/lib/active_record/associations.rb states:

    # [association=(associate)]
    #   Assigns the associate object, extracts the primary key, sets it as the foreign key,
    #   and saves the associate object.

Since commit 42dd5d9 to fix #7191, this
is no longer the case if the associate has changed, but is the same
object. For example:

    # Pirate has_one :ship
    pirate = Pirate.create!(catchphrase: "A Pirate")
    ship = pirate.build_ship(name: 'old name')
    ship.save!

    ship.name = 'new name'
    pirate.ship = ship

That last line should trigger a save. Although we are not changing the
association, the associate (ship) has changed.

Conflicts:
	activerecord/CHANGELOG.md
d881f61
Commits on May 01, 2013
Aaron Patterson tenderlove Merge pull request #10349 from caliper-io/mute_psql_output
Fix noisy output when running rake db:schema:load on postgreSQL and structure.sql
Conflicts:
	activerecord/CHANGELOG.md
1db8f9d
Aaron Patterson tenderlove Merge pull request #9857 from yyyc514/bad_params_should_400
failure to parse params should trigger a 400 Bad Request
f9ceefd
Aaron Patterson tenderlove maintain return value for recreate_database fc65d31
Carlos Antonio da Silva carlosantoniodasilva Fix failing AP test 1296adb
Brian Morearty BMorearty Revert "Object#in? also accepts multiple parameters"
This reverts commit ebf69ab.

`in?` must not take multiple parameters because its behavior would be
ambiguous:

    # Test if "B" is included in a list of names with `"B".in?(*names)`:
    names = ["BMorearty"]
    "B".in?(*names)   # => true

    names = ["BMorearty","rubyduo"]
    "B".in?(*names)   # => false

Conflicts:
	activesupport/lib/active_support/core_ext/object/inclusion.rb
	activesupport/test/core_ext/object/inclusion_test.rb
88eb1a8
Brian Morearty BMorearty Revert the guide after removing varargs from `in?`. 275a064
Rafael Mendonça França rafaelfranca Merge pull request #10397 from BMorearty/remove-varargs-from-in-4-0-s…
…table

Remove varargs from in 4 0 stable
a8ef0bb
Francesco Rodríguez frodsan add CHANGELOG entry for a8ef0bb [ci skip] eea9532
Francesco Rodríguez frodsan add unreleased header to CHANGELOGs [ci skip] bdba735
Francesco Rodríguez frodsan Merge branch 4-0-stable of github.com:lifo/docrails [ci skip] 5ba1b59
Xavier Noria fxn Revert "Correct formatting for remaining booleans"
It is not in the contract that flags have to be singletons,
the use of regular font indicates that.

This reverts commit 80036f9.
d4b5c95
Xavier Noria fxn Revert "Consistent use of code syntax formatting for boolean values"
Same rationale as previous revert.

This reverts commit 887225e.
5e98833
Rafael Mendonça França rafaelfranca Merge pull request #10400 from frodsan/add_changelog_entry_for_a8ef0bbb
Add changelog entry for a8ef0bb and update CHANGELOGs format
d5a321d
Commits on May 02, 2013
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #10407 from NARKOZ/encoding-constant
Use constant for encoding
30dcd48
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #10426 from tkrajcar/rescue-h1-fix
Add styling to h1 for default rescue layout
417bdbb
Lars Kanis larskanis Add note about libpq connection params in CHANGELOG 0fa3f3e
Rafael Mendonça França rafaelfranca Merge pull request #10431 from larskanis/add_note_about_libpq_params_…
…in_changelog

Add note about new database parameters for PostgreSQL adapter in CHANGELOG
c178177
Rafael Mendonça França rafaelfranca Merge pull request #10424 from markevich/fix_test_prepare
Restore ActiveRecord connection to original environment after rake:db:test:prepare task.
57584e4
Commits on May 03, 2013
Jon Leighton jonleighton Fix broken mysql test
test_mysql_integer_not_null_defaults in test/cases/defaults_test.rb was
failing. This test relies on the connection being in strict mode. By
default a new connection is not in strict mode, but Active Record
automatically places it in strict mode.

ActiveSchemaTest overwrites the connection's #execute method in order to
prevent SQL statements from actually being executed. One of the
operations which is performed in ActiveSchema test is a #recreate_database.

Since 2088bf2, recreate_database on
mysql or mysql2 will trigger a reconnect.

Due to the implementation of the hacking of #execute in
ActiveSchemaTest, this reconnect would take place, but the connection
would *not* be placed in strict mode because #execute had been
overridden to prevent SQL queries hitting the database.

Therefore, after ActiveSchemaTest, the connection would no longer be in
strict mode, causing test_mysql_integer_not_null_defaults to fail.

I don't think that the way that ActiveSchemaTest is implemented is
particularly nice or clean, but I have taken steps to make its hacks
more isolated - it now create a separate connection object which is
thrown away after the test, and the hacks are applied on the singleton
class of this object.
3652e4e
Jon Leighton jonleighton Work around change in how MiniTest detects SIGINFO
MiniTest 4.7.3 detects the presence of SIGINFO and stores the answer in
a constant.

It seems that MiniTest 4.7.4 changes this, and instead relies on an
info_signal method being implemented on the runner object.

In ActiveSupport::Testing::Isolation, we use ProxyTestResult to stand in
for the runner object. This object implements `method_missing`, and as
such its #info_signal method has a truthy return value. This results in
MiniTest trying to install the SIGINFO handler on platforms where
SIGINFO does not exists.

To fix, I am simply defining an explicit ProxyTestResult#info_signal
method.
1a91098
Carlos Antonio da Silva carlosantoniodasilva Fix failures in AS with minitest 4.7.4 8ffba84
Piotr Sarnacki drogus Fix generating route from engine to other engine
A regression was introduced in 5b3bb6, generating route from within an
engine to an another engine resulted in prefixing a path with the
SCRIPT_NAME value.

The regression was caused by the fact that SCRIPT_NAME should be
appended only if it's the SCRIPT_NAME for the application, not if it's
SCRIPT_NAME from the current engine.

closes #10409
57cfa7a
Aaron Patterson tenderlove Squashed commit of the following:
commit 2683de5da85135e8d9fe48593ff6167db9d64b18
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:29:20 2013 -0700

    cannot support infinite ranges right now

commit cebb6acef2c3957f975f6db4afd849e535126253
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:26:12 2013 -0700

    reverting infinity comparison

commit 385f7e6b4efd1bf9b89e8d607fcb13e5b03737ea
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:23:28 2013 -0700

    Revert "Added ability to compare date/time with infinity"

    This reverts commit 38f28dc.

    Conflicts:
    	activesupport/CHANGELOG.md
    	activesupport/lib/active_support/core_ext/numeric/infinite_comparable.rb
    	activesupport/test/core_ext/date_ext_test.rb
    	activesupport/test/core_ext/date_time_ext_test.rb
    	activesupport/test/core_ext/numeric_ext_test.rb
    	activesupport/test/core_ext/time_ext_test.rb
    	activesupport/test/core_ext/time_with_zone_test.rb

commit 0d799a188dc12b18267fc8421675729917610047
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:18:53 2013 -0700

    Revert "Refactor infinite comparable definition a bit"

    This reverts commit dd3360e.

commit 42dec90e49745bbfae546f0560b8783f6b48b074
Author: Aaron Patterson <aaron.patterson@gmail.com>
Date:   Fri May 3 11:18:47 2013 -0700

    Revert "Require 'active_support/core_ext/module/aliasing' in the infinite_comparable module"

    This reverts commit 7003e71.
6c61dbf
Rafael Mendonça França rafaelfranca Remove CHANGELOG entry related with infinite comparison. bd8633f
Xavier Noria fxn Merge pull request #10401 from frodsan/merge_docrails
Merge docrails in 4-0-stable
29a513c
Aaron Patterson tenderlove Merge pull request #10457 from zenspider/squishy_test_order_dependencies
Fixed bad tests to clean up after themselves.
9baf8a0
Commits on May 04, 2013
Rafael Mendonça França rafaelfranca Merge pull request #10461 from rwz/master
Relaxed jbuilder dependency in Gemfile template
b2c98a5
Rafael Mendonça França rafaelfranca Merge pull request #10436 from NARKOZ/keep-images
generate 'app/assets/images' directory when creating new rails app. Fixes #10434
bdb32a4
Rafael Mendonça França rafaelfranca Merge pull request #10404 from chadmoone/fix-pg-uuid-default
Allow override of PostgreSQL UUID primary key default
0bd9330
Commits on May 06, 2013
Xavier Noria fxn let rake tasks be robust to a missing RDoc in Rubinius [Fixes #10462]
See the comment in the rescue clause towards the top of the patch for the rationale.
9294962
Commits on May 07, 2013
Aaron Patterson tenderlove Revert "Fixes skipping object callback filters"
This reverts commit 8e1d3cd.

Conflicts:
	activesupport/CHANGELOG.md
	activesupport/lib/active_support/callbacks.rb
6d8b390
Commits on May 09, 2013
Jeremy Kemper jeremy Fix that JSON and XML exception responses should give the HTTP error …
…message for their status, by default, not the message from the underlying exception
a509138
Xavier Noria fxn "rails" -> "Rails" [ci skip] dbe2364
Commits on May 10, 2013
Daniel Schierbeck dasch Don't try to EXPLAIN select_db calls a26fc5b
Commits on May 12, 2013
Xavier Noria fxn specify that dom_(id|class) are deprecated in controllers, views are …
…fine
1ecef00
Xavier Noria fxn respond_to -> respond to in a message from AM::Lint
The error message uses English to say that the object should respond
to a certain method. You check that with respond_to, but that's not
English.

This makes this error message also consistent with the rest.
5bf4d32
Rafael Mendonça França rafaelfranca Merge pull request #10560 from jkutner/master
Remove jruby-openssl from default Gemfile
c07c5ec
Commits on May 13, 2013
Rafael Mendonça França rafaelfranca Merge pull request #10586 from AJ-Acevedo/comments
Updated comment to Rails 4
ef32c57
Rafael Mendonça França rafaelfranca Merge pull request #10584 from alindeman/range-missing-alias-attribute
Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext
edc7aaa
Rafael Mendonça França rafaelfranca Merge pull request #10377 from bricker/template_digest_ending_with_nu…
…mber

Allow numbers in partial name for digesting
Conflicts:
	actionpack/CHANGELOG.md
9470b3c
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #10468 from rimidl/add-missing-require-to-actionvi…
…ew-lookupcontext

Added missing `require` to ActionView::LookupContext
7950c0f
Rafael Mendonça França rafaelfranca Merge pull request #10404 from chadmoone/fix-pg-uuid-default
Allow override of PostgreSQL UUID primary key default
0e8e1b6
Rafael Mendonça França rafaelfranca Merge pull request #10503 from kstevens715/master
Avoid method missing when calling assume_migrated_upto_version (master)

Conflicts:
	activerecord/CHANGELOG.md
adb005c
Commits on May 14, 2013
Carlos Antonio da Silva carlosantoniodasilva Revert "Merge pull request #10397 from BMorearty/remove-varargs-from-…
…in-4-0-stable"

This reverts commit a8ef0bb, reversing
changes made to 1296adb.

Reason: Partially revert this commit and properly deprecate #in? with
multiple arguments in 4-0.
c6ef49f
Commits on May 16, 2013
Rafael Mendonça França rafaelfranca Revert "Add the options method to action_controller testcase."
This reverts commit 0303c23.

Conflicts:
	actionpack/lib/action_controller/test_case.rb

REASON: It will conflict with a lot of test cases. Better to call
`process` directly since this is a very uncommon HTTP method.

Fixes #10638.
474864a
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #10639 from cbartlett/master
Remove trailing line break in template
f05436d
Sam Ruby rubys restore whitespace in Gemfile between sqlite3 and sprockets 1072602
Rafael Mendonça França rafaelfranca Merge pull request #10645 from rubys/consistent_gemfile_spacing
restore whitespace in Gemfile between sqlite3 and sprockets
807bcfa
Rafael Mendonça França rafaelfranca Revert "Integration tests support the OPTIONS http method"
This reverts commit ad46884.

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_dispatch/testing/integration.rb
	actionpack/test/controller/integration_test.rb

Reason: It will conflict with a lot of test cases. Better to call
`process` directly since this is a very uncommon HTTP method.

Fixes #10638.
14f9086
Richard Schneeman schneems Fix named routing regression from 3.2.13
When named route that is nested is used in 3.2.13

Example `routes.rb`:

```
resources :nested do
  resources :builder, :controller => 'nested/builder'
end
```

In 3.2.12 and 3.2.12 this named route would work:

```
nested_builder_path(:last_step, :nested_id => "foo")
```

Generating a url that looks like `/nested/foo/builder/last_step`. This PR fixes the regression when building urls via the optimized helper. Any explicit keys set in the options are removed from the list of implicitly mapped keys.

Not sure if this is exactly how the original version worked, but this fixes this use case regression.
6167d76
Commits on May 17, 2013
Joel Cogen joelcogen Fix detection of engine in rake db:load_config
Broken by d1d7c86
97a4a77
Piotr Sarnacki drogus Check if APP_RAKEFILE is defined cac988a
Commits on May 20, 2013
Rafael Mendonça França rafaelfranca Merge pull request #10646 from kennyj/fix_am_20130517
Fix ActionMailer testcase break with mail 2.5.4.
Conflicts:
	actionmailer/CHANGELOG.md
6cf4c75
Santiago Pastorino spastorino Merge pull request #10672 from carllerche/master
Bug fix: Evented notification subscribers can handle published events
2a72293
Commits on May 22, 2013
Rafael Mendonça França rafaelfranca Merge pull request #10711 from senny/10660_rake_db_test_prepare_needs…
…_config

the rake task `db:test:prepare` needs to load the configuration
b78ebce
Rafael Mendonça França rafaelfranca Merge pull request #10636 from seanwalbran/fix-asset-host-proc-return…
…ing-nil

fix rails4 regression with asset_host Proc returning nil
8f241cb
Commits on May 23, 2013
Rafael Mendonça França rafaelfranca Merge pull request #10222 from senny/update_bundler_section_in_assets…
…_guide

docs, adjust the application.rb snippets to match the generated file.

Closes #10449
6f70463
Commits on May 30, 2013
Rafael Mendonça França rafaelfranca Merge pull request #10785 from senny/10782_routes_inspector_deals_wit…
…h_controller_regexp

`RoutesInspector` deals with routes using regexp as `:controller` option
decfa35
Phillip Calvin pnc Fix regression in has_secure_password.
If the confirmation was blank, but the password wasn't, it would still save.
b965ce3
Commits on Jun 01, 2013
Xavier Noria fxn rewrites AR's reload documentation
* It is no longer true that options are passed to find.

* Documents that ActiveRecord::RecordNotFound may be raised.

* Documents that the reload happens in-place.

* Documents that caches are wiped.

* Documents that the method returns self.

* Documents a couple of use cases.
d26e3a0
Xavier Noria fxn revises the documentation of ActiveRecord::Relation#find_or_create_by…
… [ci skip]

* Inspect uses double quotes.

* Inspect puts a hash as in #<User ...>.

* Documents the return value, and makes explicit it can be an invalid record.

* Documents the method is not atomic.

* Documents a way to handle UNIQUE contraint violations in the event of a race condition.

* Removes the "Examples" header according to our guidelines.
81b3635
Commits on Jun 03, 2013
David Heinemeier Hansson dhh Allow Date to be compared with Time (like it was possible to compare …
…Time with Date)
df3c20f
Rafael Mendonça França rafaelfranca Revert "Merge pull request #4490 from EmmanuelOga/master"
This behaviour doesn't actually make sense, the context of
the child should not be affected by the parent. See #10492.

This reverts commit 5f8274e, reversing
changes made to 81e837e.
7f42b37
David Heinemeier Hansson dhh The behavior we had in place in rc1 was actually to convert to DateTi…
…me and use <=> from there. Restore that.
77ac25c
Commits on Jun 04, 2013
Vipul A M vipulnsward fix HashWithIndifferentAccess#to_hash behaviour 81c7c9c
Toshinori Kajihara kennyj Fix HWIA#to_hash behavior with array of hashes. 8eb6ea7
Rafael Mendonça França rafaelfranca Merge pull request #10784 from senny/10526_prevent_key_transformation
Prevent side effects in `Hash#with_indifferent_access`.
Conflicts:
	activesupport/CHANGELOG.md
72f7f94
Rafael Mendonça França rafaelfranca Merge branch 'fix-hwia' into 4-0-0 ac0d144
Guillermo Iguaran guilleiguaran Replace comment about Sprockets stub directive with a link to README …
…about all directives

Conflicts:
	railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
	railties/lib/rails/generators/rails/plugin_new/templates/rails/javascripts.js
521b12e
Commits on Jun 05, 2013
Aaron Patterson tenderlove adding a test for #10830
Conflicts:
	activerecord/test/cases/adapters/postgresql/bytea_test.rb
121ff0a
Aaron Patterson tenderlove the typecast value should be passed to the serializer. fixes #10830 8d6a6ef
Toshinori Kajihara kennyj Fix #10789. Now at last ::Logger doesn't support #silence method . 15ff21a
Aaron Patterson tenderlove only check pending migrations if there are new files 1e1b499
Aaron Patterson tenderlove Merge pull request #10482 from scudco/10432-fix-add-column-with-array
Fixes #10432 add_column not creating array columns in PostgreSQL
Conflicts:
	activerecord/CHANGELOG.md
c5ba896
Aaron Patterson tenderlove Merge pull request #10850 from arunagw/build_fix_null_migration
Need to pass parameters
fa94695
Aaron Patterson tenderlove Merge pull request #10851 from arunagw/fixing_build_pending_migration
Fixing build for not checking migration
9b3d4d2
Commits on Jun 06, 2013
Carlos Antonio da Silva carlosantoniodasilva Merge pull request #10861 from arunagw/unused_var_removed
Unused variable warning removed
9e00ae1
Xavier Noria fxn clearing autoloaded constants triggers routes reloading [Fixes #10685] 0636c3c
Xavier Noria fxn registers recent patch in the railties CHANGELOG 9c9f3d9
Arun Agrawal arunagw As we have moved to rails/docrails from lifo/docrails
Changing links to guides.

We are not worried for old versions as GitHub is
handling the redirects.
e1fbf7f
Commits on Jun 07, 2013
Jon Leighton jonleighton Merge pull request #9426 from exviva/nested_attributes_reuse_existing…
…_new_record

Do not overwrite manually built records during one-to-one nested attribute assignment
Conflicts:
	activerecord/CHANGELOG.md
ae8f2c6
Commits on Jun 08, 2013
AJ AJ-Acevedo Update Getting Started Guide - Strong Parameters [ci skip]
	modified:   guides/source/getting_started.md
ffaa850
Andrew White pixeltrix Override Time.at to work with Time-like values
Time.at allows passing a single Time argument which is then converted
to an integer. The conversion code since 1.9.3r429 explicitly checks
for an instance of Time so we need to override it to allow DateTime
and ActiveSupport::TimeWithZone values.
214e377
Commits on Jun 09, 2013
Jon Leighton jonleighton Merge pull request #10710 from senny/5554_let_the_database_raise_on_c…
…ounts

Remove column restrictions for `#count`, let the database raise if the SQL is invalid.
Conflicts:
	activerecord/CHANGELOG.md
433e75f
Commits on Jun 11, 2013
Guillermo Iguaran guilleiguaran Use sprockets-rails 2.0.0 68c6e03
Guillermo Iguaran guilleiguaran Use sass-rails 4.0.0.rc2 5fd8bfa
David Heinemeier Hansson dhh Revert "Merge pull request #10710 from senny/5554_let_the_database_ra…
…ise_on_counts".

This commit causes certain associations to no longer be able to be found through includes (polymorphic belongs_to).

This reverts commit 433e75f.
2ad168e
David Heinemeier Hansson dhh Prep for Rails 4.0.0.rc2 7b0d3a5