Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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 Feb 25, 2013
@wangjohn wangjohn Raising an ActiveRecordError when one tries to use .touch(name) on a new
object that has not yet been persisted. This behavior follows the
precedent set by update_columns.
e52ff80
@guilleiguaran guilleiguaran Merge pull request #9320 from wangjohn/touch_handling_on_new_instances
Raising an ActiveRecordError when one tries to use touch on a new record object
3285c76
@libinenjoy libinenjoy BELONGS TO ASSOCIATION | Typo fix 5c9d430
@wangjohn wangjohn Added documentation about how touch now throws an error when one tries
to use it on an unpersisted object.
3edccfb
@tenderlove tenderlove Merge pull request #9246 from Noemj/update_prepared_statements
Changed update to use prepared statements
45321a6
@senny senny update 4.0 release notes to reflect the removal of auto explain. 2777844
@fxn fxn Merge pull request #9411 from senny/add_auto_explain_removal_as_notab…
…le_change

update 4.0 release notes to reflect the removal of auto explain.
f80a6a5
@chris-baynes chris-baynes Keep second fraction when DateTime#change is called. fa891a2
@pixeltrix pixeltrix Merge pull request #9390 from chris-baynes/datetime_sec_fraction
Keep second fraction when DateTime#change is called.
d5141f2
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9409 from wangjohn/adding_documentation_to_touch
Added documentation to touch throwing an error
82c361e
@senny senny some minor AR changelog modifications [ci skip] 536b3f0
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9412 from senny/clean_ar_changelog
Some minor AR changelog modifications [ci skip]
4e286bf
@carsonmcdonald carsonmcdonald Typo fix b21a73d
@htanata htanata Improve `rake stats` for JavaScript and CoffeeScript.
Ignore block comments and calculates number of functions.
82e345d
@dhh dhh Merge pull request #9072 from htanata/statistics
Improve `rake stats` for JavaScript and CoffeeScript
add8b51
@dhh dhh Merge pull request #8530 from dasch/dependency-trackers
Custom dependency trackers for the template digestor
2b7b5f5
@rafaelfranca rafaelfranca :scissors: fa8a78d
@rafaelfranca rafaelfranca Use sass compressor as the default CSS compressor
With the new sprockets-rails we need to explicitly set the CSS
compressor.

See https://github.com/rails/sprockets-rails#changes-from-rails-3x
3eef1c7
@guilleiguaran guilleiguaran Revert "Use sass compressor as the default CSS compressor"
This reverts commit 3eef1c7.
The css compressor should be set in sass-rails plugin. Check
rails/sass-rails@339529f
for the fix.
ebe9590
@dhh dhh Preparing for 4.0.0.beta1 release c0bc9ce
@rafaelfranca rafaelfranca Do not use --local option when installing the gems 2eb8962
@yaotti yaotti Do not override attributes on `dup` by default scopes ec9aa3c
@rafaelfranca rafaelfranca Merge pull request #9197 from yaotti/fix/overriden-attr-on-dup
Fix: Overriding attributes on `dup` by default scopes
d8dd965
@rafaelfranca rafaelfranca New CHANGELOG entries always on top [ci skip] d100560
@killthekitten killthekitten Fix #9360 regression in content_for 371a5f2
@senny senny Expand order(:symbol) to "table".symbol to prevent broken queries on PG.
Fixes #9275.

When `#order` is called with a Symbol this patch will prepend the quoted_table_name.
Before the postgresql adapter failed to build queries containg a join and an order
with a symbol.

This expansion happens for all adapters.
e035699
@banyan banyan Change default root route helper 33d92bf
@josevalim josevalim Remove rack-test git dependency
The dependency was introduced in this commit:

002713c

which has been released a long time ago
6730272
@rafaelfranca rafaelfranca jquery-rails 2.2.1 was released cf863ce
@rafaelfranca rafaelfranca I released 0.0.3 some time ago efabcb4
@josevalim josevalim ar-deprecated_finders is already in the gemspec 612ebbc
@guilleiguaran guilleiguaran sprockets 2.0.0.rc3 is in rails gemspec already e75ce25
@fxn fxn AR loads activerecord-deprecated_finders, no need to add it to the Ge…
…mfile
3d303f5
@fxn fxn typo 25f90a4
@robertomiranda robertomiranda Remove sprockets-rails from the Gemfile generator ed6d8f0
@guilleiguaran guilleiguaran Merge pull request #9420 from robertomiranda/remove-sprockets-rails
Remove sprockets-rails from the Gemfile generator
46bb302
@fxn fxn removes redundant require
It turns out this file is required in active_record.rb.
a44a5e4
@guilleiguaran guilleiguaran Bump sass-rails and coffee-rails to 4.0.0.beta1 in Gemfile 94bebde
@rafaelfranca rafaelfranca Are was release bd36f18
@guilleiguaran guilleiguaran Bump i18n version to 0.6.2 80f7975
@jeremy jeremy Bundler 1.3.0 released. We prefer it for new binstub behavior. 202041e
Commits on Feb 26, 2013
@chuckbjones chuckbjones Fix deletion of empty directories:
1. When comparing the directory to delete against the top level
   cache_path, use File.realpath to make sure we aren't comparing two
   unequal strings that point to the same path. This occurs, for
   example, when cache_path has a trailing slash, which it does in the
   default Rails configuration. Since the input to
   delete_empty_directories never has a trailing slash, the comparison
   will never be true and the top level cache directory (and above) may
   be deleted. However…

2. File.delete raises EPERM when trying to delete a directory, so no
   directories have ever been deleted. Changing the code to Dir.delete
   fixes that.
b883706
@dickeyxxx dickeyxxx small typo
small typo fix
212153c
@rafaelfranca rafaelfranca Merge pull request #9425 from dickeyxxx/patch-1
small typo on upgrade guide
987daa7
@josevalim josevalim Plugins can use a similar bootscript to Rails apps 882f2da
@josevalim josevalim Apparently we can't get away from adding lib to the load path 670a267
@guilleiguaran guilleiguaran Merge pull request #9419 from banyan/change-default-root-route-helper
Change default root route helper
30859a0
@frodsan frodsan JRuby does not support racc, include it only in ruby platform 066ae49
@guilleiguaran guilleiguaran Merge pull request #9429 from frodsan/racc_jruby_incompatibility
JRuby does not support racc, include it only in ruby platform
92aa789
@amatsuda amatsuda No need to send public methods 39394ab
@bemurphy bemurphy cache_key consults updated_on timestamp if present
- Extract max timestamp retrieval for cache_key
- Update changelog for cache_key changes
1dc98c1
@rafaelfranca rafaelfranca Merge pull request #9414 from senny/9275_order_with_symbol_and_join
Expand order(:symbol) to "table".symbol to prevent broken queries on PG.
8bc5e71
@rubys rubys Allow both a path and an option on root in config/routes 977455c
@guilleiguaran guilleiguaran Merge pull request #9441 from rubys/master
This is a small thing, motivated by #9419
b1dee8c
@czarneckid czarneckid Use less hyperbole in the language re: allowed parameters 3f9baeb
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails 7184e3e
@rafaelfranca rafaelfranca Update CHANGELOGS 0f75e2c
@frodsan frodsan Add tests for #9441 7487e79
@rafaelfranca rafaelfranca Merge pull request #9444 from frodsan/add_test_for_977455cc
Add tests for #9441
3d9cfe0
@fxn fxn Merge pull request #9442 from czarneckid/adjust-generator-language
Use less hyperbole in the language re: allowed parameters
62b783e
@rafaelfranca rafaelfranca Merge pull request #9434 from zires/dev
Journey::Path::Pattern#new raise more meaningful exception message.
28bebb2
@rafaelfranca rafaelfranca Move the CHANGELOG entry to the proper place
[ci skip]
e24e086
@bemurphy bemurphy Add routing guide doc on root with namespaces.
I read #9419 and realized I didn't know you could have namespaced
roots, checked around, and a few friends didn't either.  Figured
this makes it guide worthy.
a025cd7
@exviva exviva Fix touching an invalid parent record for belongs_to
If the parent of a `belongs_to` record fails to be saved due to
validation errors, `touch` will be called on a new record, which causes
an exception (see #9320).

Example:

    class Owner < ActiveRecord::Base
      validates_presence_of :name
    end

    class Pet < ActiveRecord::Base
      belongs_to :owner, touch: true
    end

    pet = Pet.new(owner: Owner.new)

    # Before, this line would raise ActiveRecord::ActiveRecordError
    # "can not touch on a new record object"
    pet.save
dce4383
@rafaelfranca rafaelfranca Merge pull request #9443 from exviva/belongs_to_touch_new_record
Fix touching an invalid parent record for belongs_to
fcf8d6e
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9446 from bemurphy/enhance_root_route_guide
Add routing guide doc on root with namespaces. [ci skip]
00f8002
@spastorino spastorino We want i18n >= 0.6.2 but < 1.0 2fa9c88
@steveklabnik steveklabnik Merge pull request #9329 from chuckbjones/fix-cache-delete-rc
Fix deletion of empty directories
95883ca
@steveklabnik steveklabnik Move AS CHANGELOG entry up.
I merged b883706 but forgot to move the entry past beta1.
5112a6c
@subwindow subwindow Fix default output for postgres network address types 72a4670
@tenderlove tenderlove Merge pull request #8010 from subwindow/postgres_inet_default_fix
Fix default output for postgres network address types
ffeb7dd
@senny senny the router allows String contraints.
Closes #9432.
09d9f04
@pixeltrix pixeltrix Merge pull request #9437 from senny/9432_undefined_method_source_in_r…
…outes

the router allows String contraints.
923ec86
@senny senny allow non-String default params in the router.
Closes #9435.

Skip valid encoding checks for non-String parameters that come
from the matched route's defaults.
794cbf3
@pixeltrix pixeltrix Merge pull request #9439 from senny/9435_router_params_as_integers
convert non-string default params to strings in the router.
6a235fa
@frodsan frodsan remove private attribute? warning 16bd04f
Commits on Feb 27, 2013
@zires zires Make ActionDispatch::Journey::Path::Pattern#new raise more meaningful…
… exception message.
35f38b7
@steveklabnik steveklabnik Merge pull request #9452 from frodsan/remove_private_attribute_warning
remove private attribute? warning
b080ad3
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9359 from justinwb/master
Removed template_root as a configuration option
a87687e
@senny senny remove duplicated number_helper tests in AP. They are already in AS.
With 155cd5e the number_helpers were moved into AS all the tests were copied over
but the tests in AP were not deleted. This is confusing.

I removed all duplicated tests and reorganized the tests in AP to only test the
functionality, that is added in AP.
152f2f3
@senny senny cleanup AP number_helpers_test
* use 1.9 style hash syntax
* don't use brances on assert_equal
* prefere " over '
a689482
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9457 from senny/remove_duplicated_number_helper_t…
…ests

Remove duplicated number_helper tests in AP. They are already in AS.

With 155cd5e the number_helpers were moved into AS all the tests were copied over but the tests in AP were not deleted. This is confusing.

This removes all duplicated tests and reorganized the tests in AP to only test the functionality, that is added in AP.

Also cleanup some of the number helper tests.
ab87689
@Fivell Fivell fix db_runtime attribute value after raising ActionView::MissingTempl…
…ate exception
dd0bbd2
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9218 from Fivell/master
Fix calculation of db_runtime property in
ActiveRecord::Railties::ControllerRuntime#cleanup_view_runtime.

Previously, after raising ActionView::MissingTemplate, db_runtime was
not populated.

Closes #9218, Fixes #9215.

Conflicts:
	activerecord/CHANGELOG.md
02037c3
@spastorino spastorino There's no need to access Railties through self.class
Closes #9386
45aabe6
@josevalim josevalim Improve docs for AbsC::Rendering 5c13549
@steveklabnik steveklabnik Revert "Merge pull request #9207 from dylanahsmith/mysql-quote-numeric"
This reverts commit 408227d, reversing
changes made to dca0b57.
afd4a14
@senny senny `format: true` does not override existing format constraints.
Closes #9466.

Passing `format: true` used to override the constraints: { format: /json/ }
with `/.+/`. This patch only sets the format if there is no constraint present.
afddc04
Commits on Feb 28, 2013
@carlosantoniodasilva carlosantoniodasilva Enforce i18n version >= v0.6.4
Keep in sync with 3-2-stable.
9126d53
@pixeltrix pixeltrix Merge pull request #9469 from senny/9466_format_enforcing_routes
`format: true` does not override existing format constraints.
17cff2c
@pixeltrix pixeltrix Remove redundant method cf278a6
@senny senny update docs, change_table does not use TableDefinition. 36abb55
@carlosantoniodasilva carlosantoniodasilva Minor changelog improvement [ci skip] a389438
@senny senny Support PostgreSQL specific column types when using `change_table`.
Closes #9480.

We use `TableDefinition` for `#create_table` and `Table` for `#change_table`.
The PostgreSQL sepcifc types were only defined on `TableDefinition` so I
also added them to `Table`.
5d0ca74
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9484 from senny/9480_change_table_and_hstore
Support PostgreSQL specific column types when using `change_table`.

We use `TableDefinition` for `#create_table` and `Table` for `#change_table`.
The PostgreSQL sepcific types were only defined on `TableDefinition` so they needed to be added to `Table` as well.
8f6b70f
@kennyj kennyj Wrong exception is occured when raising no translatable exception e2a4b7a
@josevalim josevalim Ensure plugins generated with plugin new can boot the dummy application dc53fe9
@trevorturk trevorturk Document introduction of the ActionController::UnknownFormat exception 43ab015
@trevorturk trevorturk Document extraction of actionpack-xml_parser 27a304d
@trevorturk trevorturk Improve docs for UpgradeSignatureToEncryptionCookieStore decff78
@trevorturk trevorturk Document the switch from memcache-client to dalli 3dd5444
@trevorturk trevorturk Document rails-observers extraction 1525268
@trevorturk trevorturk Document caveat from 5b3bb61 which fixed handling SCRIPT_NAME from wi…
…thin mounted engine
8ecc2ed
@rafaelfranca rafaelfranca Merge pull request #9366 from killthekitten/fix-content_for-regression
Fix for #9360 content_for regression
fae2e4d
@trevorturk trevorturk Document sass-rails asset_url deprecation cfb04a6
@rafaelfranca rafaelfranca Improve the CHANGELOG entry
[ci skip]
c4f2f5b
@rafaelfranca rafaelfranca Merge pull request #9493 from kennyj/fix_wrong_exception
Wrong exception is occured when raising no translatable exception

Closes #8617
12cbc57
@trevorturk trevorturk Document removal of assets:precompile:primary 97d9843
@rafaelfranca rafaelfranca Improve the CHANGELOG entry
[ci skip]
2c33628
@trevorturk trevorturk Document change in routes using match 74d471a
@trevorturk trevorturk Document ActiveRecord::Fixtures becoming ActiveRecord::FixtureSet a1d8b03
@mikepmunroe mikepmunroe change log4r link to most recent, updated location 731aac7
@trevorturk trevorturk Document the deprecation of ActionView::RecordIdentifier 0407ef5
@trevorturk trevorturk Document common deprecations 5187627
@mikepmunroe mikepmunroe fix broken links to README docs in intro bbe6948
@trevorturk trevorturk Document that scopes require a callable object 5b8b977
@trevorturk trevorturk Document introduction of ActionDispatch::ParamsParser::ParseError 7874c9b
@jeremy jeremy Merge pull request #9495 from trevorturk/upgrade-guide
Add some more documentation to the upgrade guide
1823c2d
Commits on Mar 01, 2013
@jeremy jeremy Wordsmithing @trevorturk's upgrade notes
Removed the bit about `SCRIPT_NAME` handling, since setting
`default_url_options[:script_name]` does work correctly.
We ran into an issue with it but it was an app bug.
bb9f831
@codeodor codeodor Support creating a table migration generator
Sometimes you want to create a table without an associated model and
test, which is also not a join table. With this commit, you can now
do that.

Example:

    rails g migration create_posts title:string
or
    rails g migration CreatePosts title:string

This commit also moves the template the model generator uses for the
migration to the migration templates folder, as it seems a more
sensible place for it now that it is shared code.
20e0415
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8652 from codeodor/create_table_migration
Support creating a table migration generator

Sometimes you want to create a table without an associated model and
test, which is also not a join table. With this commit, you can now
do that.

Example:

    rails g migration create_posts title:string
or
    rails g migration CreatePosts title:string

This commit also moves the template the model generator uses for the
migration to the migration templates folder, as it seems a more
sensible place for it now that it is shared code.
b49a2a7
@jcoyne jcoyne Allow use of assert_template with the :file option.
This worked in Rails 3.2, but was a regression in 4.0.0.beta1
73deb3a
@senny senny don't use non-ascii ' chars in documentation ce7133b
@tm080201 tm080201 Clarified need to remove existing code in welcome index.
Signed-off-by: Chelsea Macaluso <c.macaluso@modcloth.com>
baa32a5
@cmacaluso cmacaluso Clarified removal of public/index.html file
Signed-off-by: Trent Michaels <t.michaels@modcloth.com>
f8461f7
@troyk troyk Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time
In an AR model a timestamptz attribute would return a ruby string and AR
tests did not check for any type casting.  Previous tests would pass
only because an assert_equal was being used on a Time.utc object, which
will parse the right side of the eq to a valid Time instance for
comparision.

switch to test instance of Time instead of ActiveSupport::TimeWithZone
2cc0944
@chertzel chertzel Fixed grammatical error and simplified paragraph concerning controllers.
Signed-off-by: Chelsea Macaluso <c.macaluso@modcloth.com>
a243f84
Stanislav New beauty pages(404, 422, 500)
moving changelog note to unreleased section

New beauty pages(404, 422, 500)
40f1642
@jeremy jeremy Restore note about nested SCRIPT_NAME handling. 99775fd
@chertzel chertzel Reverting commit regarding public/index.html (no longer in Rails 4.)
This reverts commit f8461f7.
3dde99d
@senny senny deal with `#append` and `#prepend` on association collections.
Closes #7364.

Collection associations behave similar to Arrays. However there is no
way to prepend records. And to append one should use `<<`. Before this
patch `#append` and `#prepend` did not add the record to the loaded
association.

`#append` now behaves like `<<` and `#prepend` is not defined.
b9399c4
@rafaelfranca rafaelfranca Merge pull request #9510 from senny/7364_warn_when_appending_prependi…
…ng_to_an_association

deal with `#append` and `#prepend` on association collections
35050ab
@dmdeller dmdeller Add explanation of :dependent => :restrict b7d50f3
Commits on Mar 02, 2013
@amatsuda amatsuda :scissors: extra blank line 2d4068d
@pixeltrix pixeltrix Merge pull request #9431 from troyk/patch-2
Fix PostgreSQL TIMESTAMP WITH TIME ZONE to return ActiveSupport::Time
c09f934
@josevalim josevalim Remove hard coded references to Active Record in railties dd5a80d
@guilleiguaran guilleiguaran Merge pull request #9512 from Jacke/master
New 404, 422, 500 pages, they are more stylish and bring ruby essence…
8fe904b
Commits on Mar 03, 2013
@senny senny integrate the strong params README into the AC guide.
The current ActionController guide does not mention strong parameters
at all. I integrated the README into the guide to explain the API.

I also included a section to illustrate that the API does not solve
all possible whitelisting scenarios.

The origin was #9454.
fb63753
@fxn fxn Merge pull request #9465 from senny/document_strong_params_in_ac_guide
integrate the strong params README into the AC guide.
48c21e3
@neerajdotname neerajdotname fix the sql that is generated from scoping 1173138
@HonoreDB HonoreDB More helpful error message when instantiating an abstract class
Calling a literal ActiveRecord::Base.new raises NoMethodError,
since it ends up calling Class.abstract_class? which does not exist.
Similarly, instantiating an actual abstract class hits the database,
when conventionally it should immediately throw NotImplementedError.

ActiveRecord::Base can't be made abstract without breaking many,
many things, so check for it separately.
53f18f2
@pixeltrix pixeltrix Use custom visitor class for optimized url helpers
Rather than trying to use gsub to remove the optional route segments,
which will fail with nested optional segments, use a custom visitor
class that returns a empty string for group nodes.

Closes #9524
86cf7a2
@josevalim josevalim Bring config.allow_concurrency back
Since the Rack::Lock still exists in development,
let's provide a way to disable it explicitly.
9ee6f3c
Commits on Mar 04, 2013
@wangjohn wangjohn Created an unscope method for removing relations from a chain of
relations. Specific where values can be unscoped, and the unscope method
still works when relations are merged or combined.
2938754
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9532 from neerajdotname/fix-sql-in-example
In example fix sql that is generated from scoping
d3fa025
@jeremy jeremy Merge pull request #9200 from wangjohn/unscoping_activerecord_merging
Introduce relation #unscope
1909808
@libinenjoy libinenjoy Small Typo 50b3b96
@NARKOZ NARKOZ add prompt to 422 page to check logs f9be80f
@steveklabnik steveklabnik Merge pull request #9537 from NARKOZ/patch-6
add prompt to 422 page to check logs
8d69cd3
@carlosantoniodasilva carlosantoniodasilva Use 1.9 hash style in changelog and doc examples [ci skip] 96050e1
@carlosantoniodasilva carlosantoniodasilva Remove .all usage from unscope doc examples [ci skip] 2e28045
@maximerety maximerety Fix formats on xhr requests when HTTP_ACCEPT is empty string
Fix ActionDispatch::Request#formats on xhr requests when HTTP_ACCEPT
header is empty string. About issue #7774, same fix as in commit bebb02f
but for xhr requests.
1d217ab
@dimko dimko Fixed typo in active record's changelog 71e4dfc
@fxn fxn Merge pull request #9540 from dimko/patch-1
Fixed typo in active record's changelog
9025f49
@josevalim josevalim Merge pull request #9541 from maximerety/fix_7774
Fix formats on xhr requests when HTTP_ACCEPT is empty string
b359c5d
@senny senny `validates_confirmation_of` does not override writer methods. b501ee4
@senny senny `has_secure_password` is not invalid when assigning empty Strings.
Closes #9535.

With 692b3b6 the `password=` setter does no longer set blank passwords.
This triggered validation errors when assigning empty Strings to `password`
and `password_confirmation`.

This patch only sets the confirmation if it is not `blank?`.
8c1687b
@tenderlove tenderlove only calculate next_id when we need a new method defined 54f9b75
@senny senny rewrite tests to have no side-effects on `include_root_in_json`. eeba679
@senny senny `ActiveRecord::Base.include_root_in_json` is `false` by default.
Closes #9459.

The PR #6597 unified the configuration for `include_root_in_json`
in AM and AR to `false`.
Later on with the refactoring commit: e030f26 the value in AR was
set to `true` but I think this was not on purpose.

With this commit both AM and AR will have the same configuration
for `include_root_in_json`, which is `false`.
8c7d401
@rafaelfranca rafaelfranca Merge pull request #9467 from senny/9459_include_json_root_out_of_sync
`ActiveRecord::Base.include_root_in_json` is `false` by default.
c5be90e
@fxn fxn adds guides/.document to tell rdoc not to process this directory
When the Rails 4 gem is installed rdoc sees markdown files below the
guides directory and processes them. With an empty .document file
we prevent that from happening. Thanks to @drbrain for the tip.
5807513
Commits on Mar 05, 2013
@ernie ernie Fix WhereChain docs to mention only not 0c39987
@tmm1 tmm1 Call String#gsub with Hash directly cc986db
@josevalim josevalim Merge pull request #9554 from tmm1/string-gsub-hash
Use 1.9 String#gsub syntax
40936da
@jroes jroes Remove reference to BugMash. Link hasn't been updated in 4 years. 55269f9
@bonsaiben bonsaiben change useless gsub to delete c614711
@senny senny strong parameters example for default values using `fetch`. [ci skip]
Origin: #9534.
aeb48c3
@senny senny example for `accepts_nested_attribtues_for` and strong parameters.
Closes #9558.
0e7abf2
@fxn fxn Merge pull request #9556 from senny/strong_params_examples
strong parameters example for default values using `fetch`.
3f490ca
@carlosantoniodasilva carlosantoniodasilva Fix typo in AC overview guide [ci skip] 57c516f
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9557 from bonsaiben/useless_gsub
Change useless gsub to delete
ee44469
@carsonmcdonald carsonmcdonald Fix typo b9b609e
@inossidabile inossidabile Routing match `via` option requirement exception message made more ex…
…plicit
3ef641e
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9561 from inossidabile/explicit_match_via_require…
…ment_exception_message

Routing match `via` option requirement exception message made more explicit
5cf472e
@senny senny assigning '0.0' to a nullable numeric column does not make it dirty 4b7a33e
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9042 from senny/9034_float_0_0_is_always_dirty
Assigning '0.0' to a nullable numeric column does not make it dirty

Example:
    product = Product.create price: 0.0
    product.price = '0.0'
    product.changed? # => false (this used to return true)
    product.changes # => {} (this used to return { price: [0.0, 0.0] })
09d1fb2
@senny senny transactional migration test-case was broken.
The cleanup commit a85625d broke the test-case.
The schema was no longer modified so there was no
way to check that the rollback actually happened.
f1241ef
@robertomiranda robertomiranda change useless gsub to tr 3bf961d
@guilleiguaran guilleiguaran Merge pull request #9564 from robertomiranda/useless_gsub
change useless gsub to tr
588f267
@senny senny transactions can be turned off per Migration.
Closes #9483.

There are SQL Queries that can't run inside a transaction. Since
the Migrator used to wrap all Migrations inside a transaction there
was no way to run these queries within a migration.

This patch adds `self.disable_ddl_transaction!` to the migration to
turn transactions off when necessary.
b337390
@kennyj kennyj Remove unused return value, because collecting_queries_for_explain is…
…n't public API.
e9fc2d3
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails 6ea48eb
@robertomiranda robertomiranda Use gsub intead of tr when the to_str is longer than the from_str 8a189d0
@guilleiguaran guilleiguaran Merge pull request #9573 from robertomiranda/useless_gsub
Use gsub intead of tr when the to_str is longer than the from_str
9e43ce5
@fxn fxn Merge pull request #9565 from kennyj/remove_unused_return_value
Remove unused return value, because collecting_queries_for_explain isn't public API.
cfa9e61
@robertomiranda robertomiranda Add DebugHelperTest 8404925
@rafaelfranca rafaelfranca Merge pull request #9574 from robertomiranda/debug_helper_test
Add DebugHelperTest
8b6e7fa
Commits on Mar 06, 2013
@carlosantoniodasilva carlosantoniodasilva Add missing require to debug helper test ee16932
@senny senny CHANGELOG entry for improved singularizing of singulars.
Closes #9559.

The actual patch was added with #4719
f8b0e54
@route route Fix ActiveRecord `subclass_from_attrs` when eager_load is false.
It cannot find subclass because all classes are loaded automatically
when it needs.
b04051d
@fxn fxn Merge pull request #9581 from senny/9559_changelog_singularizing_sing…
…ular

CHANGELOG entry for improved singularizing of singulars.
12f785f
@RKushnir RKushnir Typo in comment to ActionView::Resolver#find_all 1ffaa7a
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9585 from RKushnir/patch-1
Typo in comment to ActionView::Resolver#find_all
ac13b4d
@rafaelfranca rafaelfranca Merge pull request #9507 from senny/9483_migrations_without_transactions
Transactions can be turned off per Migration
4ce9843
@senny senny `Connection#structure_dump` is no longer used. #9518
As of ccc6910 we use `mysqldump` to create the `structure.sql`.
The old `#structure_dump` code is still in AR but never used.

I removed all relevant parts from the code-base.
854b742
@senny senny rake db:structure:dump warns when `mysqldump` is not in PATH.
Closes #9518.

The rake task used to fail silently and left an empty `structure.sql`.
It's confusing for users to get to the root of the problem.
The warning message tells them where to look.
0a5fdcd
@rafaelfranca rafaelfranca Merge pull request #9538 from senny/remove_structure_dump
`Connection#structure_dump` is no longer used
a8bc72e
@robertomiranda robertomiranda Change useless tr to gsub 482b076
@rafaelfranca rafaelfranca Merge pull request #9586 from robertomiranda/useless_tr
Change useless tr to gsub
bac3777
@spastorino spastorino debugger 1.4.0 works in Ruby 2.0 b956771
Commits on Mar 07, 2013
@rafaelfranca rafaelfranca Remove regression test added in 0268b5d
It was added because a regression caused by a712e08

Closes #9255
173e0e0
@senny senny replace non-breaking spaces with normal spaces [ci skip] 239f0d0
@anupamc anupamc Refactored and removed unnecessary lines in the test case f15d9bd
@rafaelfranca rafaelfranca Merge pull request #9596 from choudhuryanupam/master
Refactored the code to remove irrelevant lines
7a32495
@rafaelfranca rafaelfranca Merge pull request #9595 from senny/remove_non_breaking_spaces
replace non-breaking spaces with normal spaces [ci skip]
7039fdd
@rafaelfranca rafaelfranca Merge pull request #9545 from senny/9535_secure_password_blank
`has_secure_password` is not invalid when assigning empty Strings
cf09ac3
@rafaelfranca rafaelfranca Merge pull request #9474 from HonoreDB/master
More helpful error message when instantiating an abstract class

Conflicts:
	activerecord/CHANGELOG.md
d3adfd6
@senny senny test case for `serialize` default values.
Closes #9110
fa18c61
@rafaelfranca rafaelfranca Merge pull request #9105 from bemurphy/cache_key_updated_on
cache_key consults updated_on timestamp if present

Conflicts:
	activerecord/CHANGELOG.md
2e3e171
@rafaelfranca rafaelfranca Merge pull request #9597 from senny/9110_serialized_not_null_default
test case for `serialize` default values.
c683927
@rafaelfranca rafaelfranca Merge pull request #9464 from jcoyne/assert_template_file
Allow use of assert_template with the :file option.
de4a60c
@carlosantoniodasilva carlosantoniodasilva Move AP changelog entry to the top [ci skip] a049631
@carlosantoniodasilva carlosantoniodasilva Fix hash spaces and use 1.9 style hash [ci skip] 087ce9d
@neerajdotname neerajdotname Combine scope conditions using AND
Currently Post.active.inactive will result in Post.inactive since
the last where clause wins when scopes are merged.

This pull request will merge all scopes ( barring defaul scope)
using AND.

The default scope will be overridden if another scope acts on the
same where clause.

closes #7365
cd26b6a
Commits on Mar 08, 2013
@neerajdotname neerajdotname SQLite3 3.6.8+ supports savepoints c132841
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9605 from neerajdotname/sqlite-support-savepoint
SQLite3 3.6.8+ supports savepoints
a4c9538
@carlosantoniodasilva carlosantoniodasilva Fix warnings b670433
@tehgeekmeister tehgeekmeister If an index can't be found by column, use the index name.
schema_statements uses the column name by default to construct the index name, and then raises an exception if it doesn't exist, even if the name option is specified, which causes #8858.  this commit makes index_name_for_remove fall back to constructing the index name to remove based on the name option.
b6226c3
@cfabianski cfabianski Unprepared Visitor + unprepared_statement 9f54921
@jonleighton jonleighton Merge pull request #9553 from neerajdotname/7365-mergin-scopes-and-where
7365 merging scopes for where clauses
f1082b8
@jonleighton jonleighton Write a more comprehensive CHANGELOG message [ci skip] 9f007d7
@carlosantoniodasilva carlosantoniodasilva Update test name to reflect change in how scopes merging works
Introduced in f1082b8.
Full changelog in 9f007d7.

[ci skip]
9588924
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9609 from arunagw/using-latest-arjdbc
Using latest AR-JDBC for JRuby
de28157
@rafaelfranca rafaelfranca Merge pull request #8966 from cfabianski/disable_prepared_statement_w…
…hen_preparing_a_query

Unprepared Visitor + unprepared_statement

Conflicts:
	activerecord/CHANGELOG.md
22f3121
@rafaelfranca rafaelfranca Merge pull request #8868 from tehgeekmeister/master
Use the index name explicitly provided in a migration when reverting.

Fixes #8868

Conflicts:
	activerecord/CHANGELOG.md
ba6b3c1
@jonleighton jonleighton Fix rails console --sandbox
I've also added a proper acceptance test which reproduced the issue.

Closes #9513, #9515.
be3e10c
@anupamc anupamc Refactored test case with standard variable naming 1231eb8
@rafaelfranca rafaelfranca Merge pull request #9611 from choudhuryanupam/master
Refactored test case with standard variable names
dd1d309
@rafaelfranca rafaelfranca Merge pull request #9497 from route/subclass_from_attrs
Fix ActiveRecord `subclass_from_attrs` when eager_load is false.

Conflicts:
	activerecord/CHANGELOG.md
74d24ea
@rafaelfranca rafaelfranca Avoid short-circuit return ad62434
@rafaelfranca rafaelfranca Make sure options is a hash 8f9c81b
@jonleighton jonleighton The console --sandbox transaction should not be joinable
Thanks @neerajdotname for noticing this bug.
e5fc096
@carlosantoniodasilva carlosantoniodasilva Fix changelog indent, remove self from method call in changelog/doc e…
…xamples

[ci skip]
a2d57fd
@wangjohn wangjohn Refactored nested associations so they are more readable. Added comments
which make it clearer about what's going on.
dbc4134
@rafaelfranca rafaelfranca Merge pull request #9614 from wangjohn/refactoring_nested_association…
…s_for_readability

Refactored nested associations so they are more readable.
6183fa7
@exviva exviva Fix incorrectly appended square brackets to a multiple select box
If an explicit name has been given and it already ends with "[]"

Before:

    select(:category, [], {}, multiple: true, name: "post[category][]")
    # => <select name="post[category][][]" ...>

After:

    select(:category, [], {}, multiple: true, name: "post[category][]")
    # => <select name="post[category][]" ...>
8e05a6f
@vijaydev vijaydev Merge pull request #8670 from sanemat/fix/rake-desc
Add rake test description
e3c56ad
Commits on Mar 09, 2013
@carlosantoniodasilva carlosantoniodasilva Fix failing test regarding console change to fix sandboxing
Introduced in be3e10c.
11dd15a
@sakuro sakuro Preserve magic comments and content encoding of copied migrations.
During insertion of "# This migration comes from ... " comment at the beginning of
a migration, presence of magic comment was not considered.
c3a26c5
@agis- agis- Remove extra whitespace and fix a comment
minor comment fix for consistency
3e61a55
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9623 from Agis-/patch-2
Remove extra whitespace and fix a comment
01c8918
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9616 from exviva/multiple_select_name_double_squa…
…re_brackets

Fix incorrectly appended square brackets to a multiple select box

Before:

    select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
    # => <select name="post[category][][]" ...>

After:

    select(:category, [], {}, {:multiple => true, :name => "post[category][]"})
    # => <select name="post[category][]" ...>
3a210da
@jeremy jeremy Merge pull request #9621 from sakuro/migration-magic-comment-fix
Preserve magic comments and content encoding of copied migrations.
0b93c25
@rubys rubys ensure response.stream is closed c41b768
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9627 from rubys/master
ensure response.stream is closed
afd3ade
@wangjohn wangjohn Renumbering the comments in the application boot process. ff25b0e
@steveklabnik steveklabnik Merge pull request #9629 from wangjohn/numbering_of_applicationrb_is_off
Renumbering the comments in the application boot process.
c614b76
@jonleighton jonleighton Bump up timeouts
This should fix travis.

Also ensuring that we don't try to kill when pid is nil.
72be5bb
@jonleighton jonleighton Experiment to try to fix the build dc7b9d2