Revert cb3181e - no longer required.
Use absolute path

It is semantically correct than relative path.
Merge pull request #8808 from tricknotes/use-absolute-path

Use absolute path [ci skip]
Merge pull request #8800 from acapilleri/primary_key

refactor reset_primary_key and change !blank? to present? in get_primary...
Ignore binds payload with nil column in AR log subscriber

Some tests were raising the following error:

    Could not log "sql.active_record" event. NoMethodError: undefined method
    `type' for nil:NilClass`

Due to the way binds were being logged, the column info was considered
always present, but that is not true for some of the tests listed in the
issue.

Closes #8806.
Do not generate local vars for partials without object or collection

Previously rendering a partial without giving :object or :collection
would generate a local variable with the partial name by default.

This was noticed due to warnings in Ruby 2.0 of not used variables,
which turned out to be the generation of not used variables inside
partials that do not contain objects related to them.
set 'alt' attribute for image_submit_tag
Eliminate Rack::File headers deprecation warning

See http://intertwingly.net/projects/AWDwR4/checkdepot/section-6.1.html
rake test produces:
   "Rack::File headers parameter replaces cache_control after Rack 1.5."

Despite what the message says, it appears that the hearders parameter change
will be effective as of Rack 1.5:

https://github.com/rack/rack/blob/rack-1.4/lib/rack/file.rb#L24
https://github.com/rack/rack/blob/master/lib/rack/file.rb#L24
Merge pull request #8812 from rubys/master

Eliminate Rack::File headers deprecation warning
Bump rack dependency to 1.4.3

It includes security bug fixes and changes the initialization of
Rack::File to accept a hash, otherwise generating warnings.

See 295806e for the warnings fix.
Never treat action or controller as unpermitted params
Revert "unpermitted params" exception -- it's just not going to work. See the discussion on https://github.com/rails/strong_parameters/pull/75.
Merge pull request #8810 from NARKOZ/image-submit-tag

set 'alt' attribute for image_submit_tag
view_cache_dependency API

A declarative API for specifying dependencies that affect template
cache digest computation. In your controller, specify any of said
dependencies:

  view_cache_dependency { "phone" if using_phone? }

When the block is evaluated, the resulting value is included in the
cache digest calculation, allowing you to generate different digests
for effectively the same template. (Mostly useful if you're mucking
with template load paths.)
Merge pull request #8818 from jamis/master

view_cache_dependency API
evaluate the dependency blocks at the instance level, not class level
Merge branch 'master' of github.com:lifo/docrails

Conflicts:
	guides/source/getting_started.md
CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.
Merge branch 'master-sec'

* master-sec:
  CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.
  * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu
Revert "Merge branch 'master-sec'"

This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing
changes made to f049016cd348627bf8db0d72382d7580bf802a79.