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 Jul 07, 2012
@josevalim josevalim Merge pull request #6996 from kennyj/remove_unused_code_20120707
Remove unused code.
b3da67d
@josevalim josevalim Merge pull request #6993 from morgoth/engine-table-name-prefix-genera…
…tor-fix

Engine table name prefix generator fix
c55df93
@kennyj kennyj Added support add_flash_types 238a425
@josevalim josevalim Merge pull request #6992 from kennyj/improve_6977-2
Allow people to register their own flash types.
8a6780b
@jonleighton jonleighton Simplify Relation#inspect b76b9e2
@jonleighton jonleighton Relation#inspect handles doesn't perform a new query on an already-lo…
…aded relation
c433adf
@jonleighton jonleighton fixup changelog 90e42ff
@carlosantoniodasilva carlosantoniodasilva Use "instance_accessor" for flash types class attribute ea7b48b
@carlosantoniodasilva carlosantoniodasilva Merge pull request #6838 from kennyj/added_registration_task
Allow to register database tasks from different adapters
84b9781
@carlosantoniodasilva carlosantoniodasilva Merge pull request #6938 from acapilleri/as_json_refactoring
Small refactoring of as_json method
d4f5978
@jonleighton jonleighton Load all records in Relation#inspect
A test was failing due to the way that Relation#inspect causes
association proxies to ignore unsaved records added to the association.

This is fixed by simply calling to_a and letting to_a figure out how to
get the records (which, in the case of associations, takes into account
new records).

I think it is acceptable to do this rather than limiting the query at
the database level:

* It's what we've done in all released Rails versions up to this point
* The goal of the limit is to not flood the console with output - this
  is the problem we're targeting, rather than the actual loading of the
  records from the database
* You probably want to do something with those records later anyway,
  otherwise you wouldn't have built a relation for them.
d8ca791
@carlosantoniodasilva carlosantoniodasilva Refactor locked? method in query cache
Introduced in 75b340d
5fde4d4
@vijaydev vijaydev Revert "Add nodoc to relation methods"
This reverts commit c47a698.

Reason: Let's revert pending further discussions
f7562c0
@vijaydev vijaydev minor text change [ci skip] 700e5ff
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails ee20be7
@oscardelben oscardelben Add docs for eager_laod and preload 91c8d91
@oscardelben oscardelben Add doc for joins and improve includes doc 8e7470a
@schneems schneems show routes while debugging RoutingError
If someone receives a routing error, they likely need to view the routes. Rather than making them visit '/rails/info/routes' or run `rake routes` we can give them that information on the page.
fa714ec
@mattt mattt move route_inspector to actionpack
this is so we can show route output in the development when we get a routing error. Railties can use features of ActionDispatch, but ActionDispatch should not depend on Railties.
ef91cdd
@oscardelben oscardelben Add docs for having, lock and readonly e68f63e
@schneems schneems show routes while debugging added to changelog bbfd29a
Commits on Jul 08, 2012
@robin850 robin850 Add few information on Fedora and CentOS 2a408bd
@josevalim josevalim Merge pull request #6696 from schneems/schneems/sextant-routing-error
Show Routes while Debugging RoutingError
7404cda
@carlosantoniodasilva carlosantoniodasilva Merge pull request #6998 from robin850/patch-1
Add few information on Fedora and CentOS [ci skip]
15d80eb
Philipp Franke fix broken bleak_house link 266ccc3
@carlosantoniodasilva carlosantoniodasilva Remove RoutesInspector from railties, since it was moved to AP
Changes introduced in 7404cda.
Fix railties build.
21c5bc9
@carlosantoniodasilva carlosantoniodasilva Rename RouteInspector to RoutesInspector
Follow the consistency defined in dbc43bc.
9c4afcf
@carlosantoniodasilva carlosantoniodasilva Improve and fix AP changelog, sync release notes [ci skip] 3bbc2fb
@carlosantoniodasilva carlosantoniodasilva Merge pull request #7003 from philiqq/master
Fix Bleak House link in debugging guide. Closes #7002
367b0c6
@tenderlove tenderlove minitest is a gem dep, so remove this conditional 3270156
@tenderlove tenderlove minitest provides "it" and "describe"
Remove rails implementation of describe, alias "test" to "it"
22bc12e
@fcheung fcheung Document building complex forms using accepts_nested_attributes_for 3cebfa4
@lexmag lexmag Add references statements to migration generator
AddXXXToYYY/RemoveXXXFromYYY migrations are produced with references
statements, for instance

    rails g migration AddReferencesToProducts user:references
supplier:references{polymorphic}

will generate the migration with:

    add_reference :products, :user, index: true
    add_reference :products, :supplier, polymorphic: true, index: true
0cae7c6
@lexmag lexmag Update migrations guide
Add a paragraph about references statements in migration generator
and the subchapter "Supported type modifiers"
07ebc53
@philippfranke philippfranke Fix broken links in 2.2 release notes, i18n, debugging, security, 2.3…
… release notes, plugins
359af59
@rafaelfranca rafaelfranca Merge pull request #6956 from lexmag/ref_migration_generator
Add references statements to migration generator
bbc08c7
@fxn fxn Merge pull request #7004 from philiqq/master
[Guide] Fix broken links
3dc54d7
@tenderlove tenderlove we still need `describe` as the implementation differs from minitest 5921cf0
@carlosantoniodasilva carlosantoniodasilva Remove AS declarative extension from erb tag test
The extension was removed in 22bc12e,
making "test" an alias for minitest's "it".
d1c4acc
Commits on Jul 09, 2012
@mdpatrick mdpatrick Select missing formbuilder typo. bf97795
@mdpatrick mdpatrick Revert "Select missing formbuilder typo."
This reverts commit bf97795.
8139daa
@qoobaa qoobaa It's better to pass strings to assert_match - it converts them to reg…
…ular expressions, escaping special chars like '.'. It seems email.encoded contains some unexpected line breaks (due to encoding), it's better to assert_match email.body.to_s.
ad1c447
@qoobaa qoobaa Fixed second assert_match - previous one didn't make any sense (if th…
…e first passed, the second passed as well)
5610ae2
@tenderlove tenderlove deprecate `describe` without a block.
minitest/spec provides `describe`, so deprecate the rails version and
have people use the superclass version
d481170
@marten marten Add info note about sass/coffeescript use in engine assets to guide 9650d95
Commits on Jul 10, 2012
@bogdan bogdan AM::Validations: remove documentation duplicates c175563
@fxn fxn Merge pull request #7022 from bogdan/validations_doc
AM::Validations: remove documentation duplicates
836016e
@qoobaa qoobaa use 'use_zone' method in example, instead of reimplementing it 897f8f5
@sol sol [getting started] update a code listing 40ee167
@rustygeldmacher rustygeldmacher Fixed bug creating invalid HTML in select options
When a select tag is created for a field with errors, then the inserted
options will errantly have a <div class="field_with_errors"> wrapping
them.
1a935ad
@tenderlove tenderlove Merge pull request #6874 from robbkidd/rename_sequences_too
Rename default sequence when table is renamed? [AR:postgres]
d7b8f0c
@rafaelfranca rafaelfranca Merge pull request #7026 from rustygeldmacher/select_options_valid_ht…
…ml_master

Fixed bug creating invalid HTML in select options
89dc481
@carllerche carllerche Raise a helpful error message on #mount misuse afa68eb
@drogus drogus Don't raise an error if http auth token isn't well formatted
When someone sends malformed authorization header, like:

    Authorization: Token foobar

given token should be just ignored and resource should not be authorized,
instead of raising error. Before this patch controller would return 401 header
only for well formed tokens, like:

    Authorization: Token token=foobar

and would return 500 in former case.
df40d79
Commits on Jul 11, 2012
@drogus drogus Fix indentation. 542637e
@robbkidd robbkidd Add teardown method to AR::Mig::RenameTableTest
Dry up reseting the renamed table after each test.

Also made use of the AR::Base.connection object already
available from AR::MigrationTest#connection.
01fd8e5
@carlosantoniodasilva carlosantoniodasilva Merge pull request #7030 from robbkidd/dry_up_rename_table_tests
Add teardown method to AR::Mig::RenameTableTest
b1dbebc
Selem Delul Fix code comment to reflect its intent. 783fc29
@Domon Domon Fix typo 94527ea
@vijaydev vijaydev Merge pull request #7032 from necrodome/patch-1
Fix code comment to reflect its intent.
2075ada
@alindeman alindeman Fixes typo in CommentsController#create example
* comments.build will not actually persist the comment
1f87adf
Commits on Jul 12, 2012
@evantravers evantravers add second t to overwritten
fixing a misspelling in the documentation
201156b
@vijaydev vijaydev Merge pull request #7037 from evantravers/misspelling
add second t to overwritten
6a58f9c
@fxn fxn testing guide: start of a pass 1420d4e
Commits on Jul 13, 2012
Scott Stewart Change Assertion language to Expected/Actual from obj1/obj2 acec6d3
@morgoth morgoth Updated with_routing example to 3.x syntax [ci skip] 5fcf885
@jonleighton jonleighton support relations created with a table alias 4b4a855
@jonleighton jonleighton Allow associations to take a lambda which builds the scope 5a54bff
@jonleighton jonleighton fix assertion arguments order 76d3397
@jonleighton jonleighton Represent association scope options as AR::Relations insternally. 65843e1
@steveklabnik steveklabnik Added note about feature requests and rails-core list. 8ee3651
@jonleighton jonleighton extract deprecated association options to active_record_deprecated_fi…
…nders
35edd18
@kytrinyx kytrinyx Add documentation for ActiveRecord::Observer.
The instructions about configuration covered only rails-specific usage.
848c1b4
@fxn fxn Merge pull request #7043 from kytrinyx/documentation-ar-observer
Add documentation for ActiveRecord::Observer.
a734902
@kytrinyx kytrinyx Add note about needing mysql superuser for unit tests. ec4245c
@frodsan frodsan add note about requiring gem dependencies before initialization [ci s…
…kip]
bc65d0c
@kytrinyx kytrinyx Add link to relevant rails guide to Active Record unit test docs. 7e5c686
@fxn fxn Merge pull request #7044 from kytrinyx/documentation-ar-unit-tests
Add note about needing mysql superuser for unit tests.
c733b8e
@kennyj kennyj Remove duplicated code in the AR::Store. 6c7c89a
@jonleighton jonleighton stop using class_attribute where methods/inheritance will suffice. 09d2f16
@jonleighton jonleighton move the deprecated options into active_record_deprecated_finders ac4d101
@fxn fxn revises RUNNING_UNIT_TESTS to delegate stuff to the contributing guide bf6d64c
@rafaelfranca rafaelfranca Merge pull request #7045 from kennyj/remove_duplicated_code_20120714
Remove duplicated code in the AR::Store.
fd9655c
@kennyj kennyj Remove instance level quote_value method. This method is private and …
…also exists in class method.
539b69e
@kennyj kennyj Remove duplicated unique index name. 87a8644
@rafaelfranca rafaelfranca Merge pull request #7048 from kennyj/tiny_fixes
[tiny fixes] Remove more duplicated code.
8baaa45
@jonleighton jonleighton fix association :extend option 7fa9cb5
@jeremycole jeremycole Only use prepared statements when bind variables are present
Prepared statements (prepare/execute/close) were being used unnecessarily
when no bind variables were present, and disabling prepared statement using
prepared_statements:false was principally broken. While bind variables were
correctly substituted with prepared_statements:false, the prepared statement
interface was still used, costing an extra two round trips per query.

In addition to making this behavioral change, I also cleaned up the internals
of exec_stmt and exec_without_stmt so that they behave the same (calling log
and constructing the ActiveRecord::Result in the same way).

Moving the check for binds.empty? to exec_query also will mean that several
code paths explicitly calling exec_without_stmt could be cleaned up to once
again call exec_query instead. I have also left the check for binds.empty? in
exec_stmt, since it is not a private method and could be called directly with
an empty binds array. For the sake of clarity in this patch, I have not made
those changes.

= The previous behavior =

When issuing a Foo.find(1) with prepared_statements:true, the bind variable
is present in the prepared query, and execute shows a value passed:

    Connect	root@localhost on rails_test
    Query	SET SQL_AUTO_IS_NULL=0
    Statistics
    Query	SHOW FULL FIELDS FROM `foos`
    Query	SHOW TABLES LIKE 'foos'
    Query	SHOW CREATE TABLE `foos`
    Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = ? LIMIT 1
    Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
    Close stmt
    Quit

When issuing a Foo.find(1) with prepared_statements:false, the bind variable
has already been removed and substituted with the value, but the prepared
statement interface is used anyway:

    Connect	root@localhost on rails_test
    Query	SET SQL_AUTO_IS_NULL=0
    Statistics
    Query	SHOW FULL FIELDS FROM `foos`
    Query	SHOW TABLES LIKE 'foos'
    Query	SHOW CREATE TABLE `foos`
    Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
    Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
    Close stmt
    Quit

= With this patch applied =

When issuing a Foo.find(1) with prepared_statements:true, the bind variable
is present in the prepared query, and execute shows a value passed:

    Connect	root@localhost on rails_test
    Query	SET SQL_AUTO_IS_NULL=0
    Statistics
    Query	SHOW FULL FIELDS FROM `foos`
    Query	SHOW TABLES LIKE 'foos'
    Query	SHOW CREATE TABLE `foos`
    Prepare	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = ? LIMIT 1
    Execute	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
    Close stmt
    Quit

When issuing a Foo.find(1) with prepared_statements:false, the bind variable
has been removed and substituted with the value, and the query interface is
used instead of the prepared statement interface:

    Connect	root@localhost on rails_test
    Query	SET SQL_AUTO_IS_NULL=0
    Statistics
    Query	SHOW FULL FIELDS FROM `foos`
    Query	SHOW TABLES LIKE 'foos'
    Query	SHOW CREATE TABLE `foos`
    Query	SELECT  `foos`.* FROM `foos`  WHERE `foos`.`id` = 1 LIMIT 1
    Quit
2f9a0f7
@jeremycole jeremycole Fixing texts; down to three failing tests.
Conflicts:
	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
220864e
@tenderlove tenderlove fixing tests to deal with data differences between prepared statement…
…s and non-prepared statements

Conflicts:
	activerecord/test/cases/query_cache_test.rb
0736e16
@tenderlove tenderlove teaching the mysql adapter how to typecast strings returned from the …
…database
d08fee3
Commits on Jul 14, 2012
@pferdefleisch pferdefleisch Added time related req files to AS core_ext #6896
This way you can `require 'active_record/core_ext/time'` for example
I see these libs are available through `active_record/time` but not
individually
4940dc2
@fxn fxn Merge pull request #7053 from pferdefleisch/activesupport-timely-requ…
…ires

Added time related req files to AS core_ext #6896
9b7401b
@kennyj kennyj Avoid to call send(store_attribute) twice. 088022e
@rafaelfranca rafaelfranca Merge pull request #7056 from kennyj/avoid_twice_call
Avoid to call send(store_attribute) twice.
b7ad71b
@kennyj kennyj Fix SqlBypass.data_column= problem. SqlBypass.find_by_session_id meth…
…od didn't use this assignment.
cd44862
@rafaelfranca rafaelfranca Merge pull request #7057 from kennyj/fix_sql_bypass_problem
Fix SqlBypass.data_column problem.
1156300
@kennyj kennyj session_id column is string in default 92dcdc5
@fxn fxn adds a missing require [fixes #6896]
This file uses Time.zone, which is defined in
active_support/core_ext/time/zones.rb.
aa6f512
Commits on Jul 15, 2012
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails a80e1e4
Commits on Jul 16, 2012
@wkang wkang Fix activerecord model to_ary method comment 'see also' link 9c243b4
@rafaelfranca rafaelfranca Merge pull request #7066 from wkang/master
Fix activerecord model to_ary method comment 'see also' link
4a0f6e6
Jared Beck A more informative comment for config.asset.debug df6aa8c
Steve Jorgensen Don't crash exception translation w/ nil result attribute.
Exception.result is nil when attempting a query after PostgreSQL
disconnect, resulting in new exception:
NoMethodError: undefined method `error_field' for nil:NilClass
0d63cda
Steve Jorgensen Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests. 6d5f4de
Steve Jorgensen Stop being silly with formatting of method aliasing. 4b1bca0
@oscardelben oscardelben Add documentation for create_with 9735076
@oscardelben oscardelben Add documentation for arel and build_arel c0e186c
@oscardelben oscardelben Add nodoc to create_with_value
Reason: all *_value methods are defined dynamically and so don't appear
in the documentation.
37afdef
@oscardelben oscardelben Add documentation for query_methods bang methods 993ef9e
@oscardelben oscardelben Typo b64599a
@drogus drogus Merge pull request #7006 from jaredbeck/issue_7005_explain_asset_debug
A more informative comment for config.asset.debug
15bfaa3
Commits on Jul 17, 2012
@oscardelben oscardelben Don't link to edgeguides in docs 9887440
@oscardelben oscardelben Add docs for Relation initialize, create and create! 5edbeb0
@beerlington beerlington Fixes "Cannot visit ..." with validates_uniqueness_of
Fixes issue with overrding ActiveRecord reader methods with a
composed object and using that attribute as the scope of a
validates_uniqueness_of validation.
0c3c227
@kennyj kennyj Fix class_eval without __FILE__ and __LINE__. 414008f
@jonleighton jonleighton Merge pull request #7072 from beerlington/fix_validations_with_scope
Use database value for uniqueness validation scope
d0ba994
@tenderlove tenderlove Merge pull request #7076 from kennyj/fix_class_eval
Fix class_eval without __FILE__ and __LINE__.
939f014
@kennyj kennyj Log query plan when we use count_by_sql method. 1b25283
@pixeltrix pixeltrix Add support for optional root segments containing slashes
Optional segments with a root scope need to have the leading slash
outside of the parentheses, otherwise the generated url will be empty.
However if the route has non-optional elements then the leading slash
needs to remain inside the parentheses otherwise the generated url
will have two leading slashes, e.g:

Blog::Application.routes.draw do
  get '/(:category)', :to => 'posts#index', :as => :root
  get '/(:category)/author/:name', :to => 'posts#author', :as => :author
end

$ rake routes
  root GET /(:category)(.:format)              posts#index
author GET (/:category)/author/:name(.:format) posts#author

This change adds support for optional segments that contain a slash,
allowing support for urls like /page/2 for the root path, e.g:

Blog::Application.routes.draw do
  get '/(page/:page)', :to => 'posts#index', :as => :root
end

$ rake routes
root GET /(page/:page)(.:format) posts#index

Fixes #7073
d8745de
@lexmag lexmag Add join table migration generator
For instance, running

    rails g migration CreateMediaJoinTable artists musics:uniq

will create a migration with

    create_join_table :artists, :musics do |t|
      # t.index [:artist_id, :music_id]
      t.index [:music_id, :artist_id], unique: true
    end
211d88b
@jfirebaugh jfirebaugh AR::Integration must be included after AM::Conversion
Integration's definition of #to_param must override
Conversion's. Otherwise, there is a regression from
3.1 in the behavior of a non-persisted AR::Base instance
which nevertheless has an id.
80f6125
@jonleighton jonleighton Merge pull request #7081 from jfirebaugh/to_param_regression_master
AR::Integration must be included after AM::Conversion
d00b635
@oscardelben oscardelben Improve docs for AR Relation 2c050e1
@oscardelben oscardelben Fix typos and add nodocs to NullRelation 30bf42b
@oscardelben oscardelben Add nodoc to HashMerger and Merger 28e5341
@oscardelben oscardelben Update batches docs 21123d3
@oscardelben oscardelben Add nodocs to delegation module and docs for merge! 27014bb
Commits on Jul 18, 2012
@route route Common behavior with adding formats to lookup_context for TemplateRen…
…derer and PartialRenderer
eb19ca3
@josevalim josevalim Merge pull request #6626 from route/render_formats
Add additional formats to lookup context
17b6fa8
@josevalim josevalim Merge pull request #7028 from lexmag/join_table_indexes
Add indexes to create_join_table method
58ccc9f
@jalkoby jalkoby add lazy look up in abstract controller's translate method 1b5298e
@josevalim josevalim Merge pull request #7082 from jalkoby/lazy_lookup_in_abstract_controller
add lazy look up in abstract controller's translate method
1b39d39
@LTe LTe Don't use default separator
When the default separator is set logger will create incorrect output
dc97a9a
@josevalim josevalim Update changelog for migration generator change e243a8a
@josevalim josevalim Merge pull request #7084 from LTe/logger_default_separator
Don't use default separator in tagged logger
c08f30f
@carlosgaldino carlosgaldino Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` option
This applies to the following helpers:
`button_to`
`button_tag`
`image_submit_tag`
`link_to`
`submit_tag`
fb8a830
@rafaelfranca rafaelfranca Merge pull request #6614 from carlosgaldino/data-confirm
Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` option
3507216
Dave Kroondyk revert Default timestamps to non-null
Commit 3dbedd2 added NOT NULL constraints to timestamps.
Commit fcef728 started to revert this, but was incomplete.
With this commit, 3dbedd2 should be fully reverted and
timestamps will no longer default to NOT NULL.
ccf7cd0
@rafaelfranca rafaelfranca Merge pull request #7095 from davekaro/master
revert Default timestamps to non-null
fe5b943
@lexmag lexmag Add fkey attributes to `join_table` migration generator 5a7d319
@tenderlove tenderlove Revert "Merge pull request #7084 from LTe/logger_default_separator"
This reverts commit c08f30f, reversing
changes made to e243a8a.
e482100
Commits on Jul 19, 2012
@shigeya shigeya Clarification to doc of ActionController::MimeResponse.respond_to
- #respond_to's documentation refer to .respond_to, but it was
  written as just <respond_to>. Added class name for clarification.
9674d2c
@josevalim josevalim Merge pull request #7097 from lexmag/join_table_gen_attr
Add fkey attributes to `join_table` migration generator
993e164
@josevalim josevalim Use attributes instead of table names in migration example 2470501
@carlosantoniodasilva carlosantoniodasilva Create default join table name using a Symbol
Lets stick with a symbol in join table name, it was removed in
993e164 and broke the build.
2897bf1
@rafaelfranca rafaelfranca Merge pull request #7078 from kennyj/logging_query_plan
Log query plan when we use count_by_sql method.
fa3c84f
@erichkist erichkist Fix a reference 6987966
@oscardelben oscardelben Fix typos 11d488d
@tenderlove tenderlove adding Rails::Queueing::Container
This allows us to do:

In your configuration:
Rails.queue[:image_queue] = SomeQueue.new
Rails.queue[:mail_queue]  = SomeQueue.new

In your app code:
Rails.queue[:mail_queue].push MailJob.new

Both jobs pushed to the same default queue
Rails.queue.push DefaultJob.new
Rails.queue[:default].push DefaultJob.new
3b3ca13
@tenderlove tenderlove perform request inside a thread a6a5fda
@tenderlove tenderlove make sure the latch is released on exceptions 6471467
@tenderlove tenderlove stream is available on the response b403935
@tenderlove tenderlove removing the transver encoding header eb68521
@tenderlove tenderlove copy thread locals over to new thead 9fcdc4d
@tenderlove tenderlove move the latch to the response object 65253df
@tenderlove tenderlove fix variable names 7854451
Commits on Jul 20, 2012
@LTe LTe Use join without default separator
Use lstrip method
b0ab8dc
@dosire dosire Make it clear that you can also pass a full url to assert_routing. 5a6f30f
@pixeltrix pixeltrix Support constraints on resource custom params when nesting
The Mapper looks for a :id constraint in the scope to see whether it
should apply a constraint for nested resources. Since #5581 added support
for resource params other than :id, we need to check for a constraint on
the parent resource's param name and not assume it's :id.
27619e3
@pixeltrix pixeltrix Don't assume resource param is :id when using shallow routes
Since #5581 added support for resources with custom params we should
not assume that it is :id when using shallow resource routing.
cabb447
@f1sherman f1sherman Clean up Sweeper controller accessor when an Error is raised 35fe310
@carlosantoniodasilva carlosantoniodasilva Merge pull request #7106 from LTe/default_separator_updated
Use join without default separator in tagged logger
3a07fdc
@jonleighton jonleighton Avoid options ever being nil
This fixes active_record_deprecated_finders.
7a271a8
@jonleighton jonleighton Convert association macros to the new syntax e1cfa6e
@rafaelfranca rafaelfranca Merge pull request #7099 from f1sherman/sweeper-clean-up-if-exception…
…-raised

Clean up Sweeper controller accessor when an Error is raised
f3e4d20
@rafaelfranca rafaelfranca `validates_inclusion_of` and `validates_exclusion_of` now accept
`:within` option as alias of `:in` as documented.

Fix #7118
53edd32
@rafaelfranca rafaelfranca Don't pass `:within` option to the i18n 770fa81
@rafaelfranca rafaelfranca Update documentation and change the range method name to delimiter. a63f7a1
@jonleighton jonleighton Remove obsolete line.
This code is broken (it should say association_scope.uniq_value rather
than options[:uniq]) but the tests still pass.

I think it is designed to uniq-ify associations using finder_sql.
However, I am about to remove that anyway.
70a86c6
@jonleighton jonleighton Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql. 3803fcc
@jonleighton jonleighton we don't need this arg ac48b62
@jonleighton jonleighton remove references to :finder_sql, :counter_sql, :delete_sql, :insert_…
…sql from guides
df0b7a8
@jonleighton jonleighton remove unused method 45285f5
@jonleighton jonleighton rm redundant test
now everything is converted to the new style, this is not needed
f7d8aac
@jonleighton jonleighton rm unnecessary test
interpolation is no longer a thing separate from "normal" assoc
conditions.
2f6e33d
Brent Wheeldon & Nick Monje AR has a subclass of AM:PresenceValidator.
This allows us to mark the parent object as invalid if all associated objects
in a presence validated association are marked for destruction.

See: #6812
9feda92
Commits on Jul 21, 2012
@fxn fxn Merge pull request #7100 from shigeya/fix_mime_responds_to_doc
Clarification to doc of ActionController::MimeResponse.respond_to
d721148
@fxn fxn copy-edits 9674d2c 3561e85
@fxn fxn Hash#fetch(fetch) is not the same as doing hash[key] 98f4aee
@fxn fxn Revert "Fix a reference"
The sentence itself was not exact, [] and fetch are different. Reverting
in docrails because it has been reworded in master and 3-2-stable,see
98f4aee.

This reverts commit 6987966.
b669353
@fxn fxn makes a pass over the API of ActiveSupport::HashWithIndifferentAccess db4fdb5
@vijaydev vijaydev Revert "Make it clear that you can also pass a full url to assert_rou…
…ting."

This reverts commit 5a6f30f.
60df591
@vijaydev vijaydev minor copy edits [ci skip] c851def
@vijaydev vijaydev improve NullRelation docs [ci skip] 8fe5f01
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails dad5446
@vijaydev vijaydev update 4.0 release notes [ci skip] 9694b75
@rafaelfranca rafaelfranca Copy-edits at Rails::Queueing documentation b4ef4d7
@rafaelfranca rafaelfranca Lets be consistent with whitespaces at documentation f1a317b
@rafaelfranca rafaelfranca +"foo"+ doesn't generate code tag [ci skip] f5d0e3d
Carlos Galdino + Rafael Mendonça França Add back `:confirm` and change deprecation horizon to 4.1 9345a11
Carlos Galdino + Rafael Mendonça França Add back `:disable_with` and change deprecation horizon to 4.1 0106e5f
Carlos Galdino + Rafael Mendonça França Remove deprecation warnings 5b9d0a6
@frodsan frodsan fixing :nodoc:s in AS::JSON::Encoding 12ae9d6
@rafaelfranca rafaelfranca Merge pull request #7126 from frodsan/fix_nodoc_encoding
fixing :nodoc:s in AS::JSON::Encoding
1b2a7ba
Commits on Jul 22, 2012
@nashby nashby don't escape options in option_html_attributes method
we don't need to escape values in this method as we pass
these html attributes to `tag_options` method that handle escaping as
well.

it fixes the case when we want to pass html5 data options
dacbcbe
@rafaelfranca rafaelfranca Merge pull request #7123 from nashby/data-in-options
don't escape options in option_html_attributes method
440a5eb
@kennyj kennyj Restore connection_id on error. 8ca93c7
@rafaelfranca rafaelfranca Merge pull request #7130 from kennyj/fix_restoring_query_cache
Restore connection_id on error.
61be340
@rafaelfranca rafaelfranca Add one more test case to make sure that data attributes are being
escaped
580fa0c
Commits on Jul 23, 2012
@pixeltrix pixeltrix Bump Journey requirements to 1.0.4
There are some Action Pack tests for regressions from 3.1 that require
a later version of Journey to pass so bump to the current version.
4d7a102
@kennyj kennyj Fix build. Bump Journey requirements to 2.0.0. 6ebfe8b
@rafaelfranca rafaelfranca Merge pull request #7137 from kennyj/fix_installing_problem_journey
Fix build. There is journey-1.0.4 on the 1-0-stable branch.
998189a
@spastorino spastorino Remove ActionDispatch::Head middleware in favor of Rack::Head
Closes #7110 there's more work to do on rack-cache issue 69
449039a
@spastorino spastorino Add CHANGELOG entry 14a1df1
Commits on Jul 24, 2012
@accessd accessd fix typo in callbacks test f35f6ab
@spastorino spastorino Merge pull request #7143 from accessd/fix-typo-callbacks-test
fix typo in validations callbacks test
aac9d2c
@tenderlove tenderlove Merge branch 'master' into async
* master: (55 commits)
  fix typo in callbacks test
  Add CHANGELOG entry
  Remove ActionDispatch::Head middleware in favor of Rack::Head
  Fix build. Bump Journey requirements to 2.0.0.
  Bump Journey requirements to 1.0.4
  Add one more test case to make sure that data attributes are being escaped
  Restore connection_id on error.
  don't escape options in option_html_attributes method
  fixing :nodoc:s in AS::JSON::Encoding
  Remove deprecation warnings
  Add back `:disable_with` and change deprecation horizon to 4.1
  Add back `:confirm` and change deprecation horizon to 4.1
  +"foo"+ doesn't generate code tag [ci skip]
  Lets be consistent with whitespaces at documentation
  Copy-edits at Rails::Queueing documentation
  update 4.0 release notes [ci skip]
  improve NullRelation docs [ci skip]
  minor copy edits [ci skip]
  Revert "Make it clear that you can also pass a full url to assert_routing."
  makes a pass over the API of ActiveSupport::HashWithIndifferentAccess
  ...
648e198
@rafaelfranca rafaelfranca Merge pull request #6991 from frodsan/performance_test_generator
update performance test template to use test method
66b859b
@yahonda yahonda This pull requests addresses ORA-01400 errors and also supports #6115
…issue tested.

Issue #6115 has been fixed and tested with
the attribute `:null => false, :default => ""`
However `:null => false` attribute is not necessary to test this issue,
which causes many ORA-01400 errors with Oracle enhanced adapter.
0da4950
@lucasmazza lucasmazza Replace the flush parameter with a Hash. 9a020bd
@rafaelfranca rafaelfranca Merge pull request #7150 from lucasmazza/flush_option
Replace the flush parameter with a Hash.
d7856d3
@rafaelfranca rafaelfranca Merge pull request #7148 from yahonda/address_6195
Addresses ORA-01400 errors and also supports #6115
2d6af1d
@smartinez87 smartinez87 New #update_columns method. 87ffc36
@rafaelfranca rafaelfranca Use update_columns to implemente the update_column da84ccb
@rafaelfranca rafaelfranca Deprecate update_column in favor of update_columns.
Closes #1190
2d9e5a2
@rafaelfranca rafaelfranca Merge branch 'update_columns' 864b49d
@graceliu graceliu remove duplicate build runs in travis. These extra runs were used to
test identity map and not fully removed when the feature was removed.
0c1c0c6
Commits on Jul 25, 2012
@carlosantoniodasilva carlosantoniodasilva Merge pull request #7151 from graceliu/travis-rm-dup-run
remove duplicate build runs in travis
c324f42
@yahonda yahonda Use string datatype for the setting attribute
to make store works all database adapters.
05895c6
@rafaelfranca rafaelfranca Merge pull request #7158 from yahonda/use_string_for_settings
Use string datatype for the setting attribute
b5c2384
@tenderlove tenderlove Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2
Postgresql auto reconnect 2
0dc356e
Commits on Jul 26, 2012
@michaelfairley michaelfairley Eager autoload ActiveRecord association helpers a052fc9
@parndt parndt Switched update_column recommendation in changelog to update_columns
Related to #7164

Looks like the last one; thanks!
ffe8b0a
@rafaelfranca rafaelfranca Merge pull request #7165 from parndt/patch-5
Switched update_column recommendation in changelog to update_columns
dc464b9
@ayrton ayrton Update activerecord/CHANGELOG.md
Fixed markdown code indenting
c046a29
@jonleighton jonleighton Merge pull request #7161 from michaelfairley/eager_load_active_record…
…_association_helpers

Eager autoload ActiveRecord association helpers
07c455d
@jonleighton jonleighton Merge pull request #7166 from ayrton/patch-1
Update activerecord/CHANGELOG.md
88c205b
@route route Missed extend for eager_autoload 8cf300c
@josevalim josevalim Merge pull request #7167 from route/missed_extend
Missed extend for eager_autoload
b1d7283
@beerlington beerlington Refactor ActiveRecord::Inheritance.base_class logic
Moved logic from class_of_active_record_descendant(class) to the
base_class method. This method was confusing because it required
an argument, but that argument was 'self'.

Moved base_class tests to inheritance_test.rb and added some test
coverage for some untested cases.
d0aebd5
@makaroni4 makaroni4 fix typo in documentation 103a313
@rafaelfranca rafaelfranca Merge pull request #7170 from makaroni4/master
Fix typo in documentation
f4c2a12
@rafaelfranca rafaelfranca Merge pull request #7171 from beerlington/refactor_inheritance_base_c…
…lass

Refactor ActiveRecord::Inheritance.base_class logic
90c9ae5
@tenderlove tenderlove * Do not convert digest auth strings to symbols. CVE-2012-3424
Conflicts:
	actionpack/lib/action_controller/metal/http_authentication.rb
fee0bc5
Commits on Jul 27, 2012
@yahonda yahonda Modify the preference attribute from `:null => false` to `:null => true`
to address ORA-01400 errors with Oracle enhanced adapter.

Issue #4856 had been fixed and tested with
the attribute `:null => false, :default => ""`.
Now `:null => false` attribute is not necessary to test this issue.
dab8ca5
@rafaelfranca rafaelfranca Merge pull request #7173 from yahonda/address_7138
Modify the preference attribute from `:null => false` to `:null => true`
87f3bd0
@rafaelfranca rafaelfranca Only require the `:rails_env` task where is needed.
`:rails_env` tasks is not needed in all the tasks that depends of
`load_config`, only in the tasks that uses `Rails.env`.

Since `:rails_env` task set the `Rails.env` to be "development" if it is
not set we don't need the `||` statements too

Fix #7175.

Conflicts:
	activerecord/lib/active_record/railties/databases.rake
f1afd77
@jonleighton jonleighton ActiveRecord::Base.all returns a Relation.
Previously it returned an Array.

If you want an array, call e.g. `Post.to_a` rather than `Post.all`. This
is more explicit.

In most cases this should not break existing code, since
Relations use method_missing to delegate unknown methods to #to_a
anyway.
6a81ccd
@jonleighton jonleighton Deprecate ActiveRecord::Base.scoped.
It doesn't serve much purpose now that ActiveRecord::Base.all returns a
Relation.

The code is moved to active_record_deprecated_finders.
b658cf1
@jonleighton jonleighton Deprecate Relation#all.
It has been moved to active_record_deprecated_finders.

Use #to_a instead.
d109954
@jonleighton jonleighton Changelog and doc updates for the previous changes. 3205c76
@dhh dhh will now return nil instead of raise a NoMethodError if the receivin…
…g object does not implement the method
99ea1a8
@dhh dhh Add Object#try! with the old NoMethodError raising behavior 04998cd
@josevalim josevalim Merge pull request #6827 from zephyr-dev/master
Validates_presence_of associated object marked for destruction
1fab518
@yahonda yahonda Modity the :json_data_empty attribute from `:null => false` to `:null…
… => true`

to address ORA-01400 errors with Oracle enhanced adapter.

The original commit 3c0bf04 requires :json_data_empty attribute
has empty string OR null, then setting `:default => ""` is enough.
708b5c0
@jfirebaugh jfirebaugh Don't test language-level exception messages
Ruby implementations should be free to produce exception
messages that are not identical to MRI. For example,
Rubinius produces 'Expected an even number, got 5'.
e113480
@rafaelfranca rafaelfranca Merge pull request #7181 from jfirebaugh/rbx
Don't test language-level exception messages
f3bfcbb
@rafaelfranca rafaelfranca Merge pull request #7182 from yahonda/address_7178
Modity the :json_data_empty attribute from `:null => false` to `:null => true`
c01810d
@tenderlove tenderlove Merge branch 'master' into async
* master: (29 commits)
  Don't test language-level exception messages
  Modity the :json_data_empty attribute from `:null => false` to `:null => true` to address ORA-01400 errors with Oracle enhanced adapter.
  Add Object#try! with the old NoMethodError raising behavior
  will now return nil instead of raise a NoMethodError if the receiving object does not implement the method
  Changelog and doc updates for the previous changes.
  Deprecate Relation#all.
  Deprecate ActiveRecord::Base.scoped.
  ActiveRecord::Base.all returns a Relation.
  Only require the `:rails_env` task where is needed.
  Modify the preference attribute from `:null => false` to `:null => true` to address ORA-01400 errors with Oracle enhanced adapter.
  * Do not convert digest auth strings to symbols. CVE-2012-3424
  fix typo in documentation
  Refactor ActiveRecord::Inheritance.base_class logic
  Missed extend for eager_autoload
  Update activerecord/CHANGELOG.md
  Switched update_column recommendation in changelog to update_columns
  Eager autoload ActiveRecord association helpers
  Use string datatype for the setting attribute to make store works all database adapters.
  remove duplicate build runs in travis.  These extra runs were used to test identity map and not fully removed when the feature was removed.
  Deprecate update_column in favor of update_columns.
  ...
61e31f2