| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
This reverts commit 2aef9fddf8b4487a05638ea3341dfd65ceb229ef.
Reason: The added change isn't clear in terms of explaining the
arguments. Will ask the author to provide a PR and take it forward.
[ci skip]
|
|
|
|
|
|
|
|
| |
Revert Festival!
I reverted a reverted commit, undo.
This reverts commit 07ea37763d62e57d5709ab37da01b2848d12edd5.
|
|
|
|
|
|
|
|
|
|
|
|
| |
Reason: docrails policy is very strict about code. No matter how
innocent the change, if it is not documentation it needs to go
through a PR to rails/rails.
Plase see the warning box at the bottom of
http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#contributing-to-the-rails-documentation
This reverts commit e1c5d24369440857de1402d61c85d982b29d8019.
|
|
|
|
|
|
|
|
|
| |
This reverts commit 9b1c077c91f09b64b8105f31fdf5240cd12c2e16.
my bad.
`assert_template` only accepts a String, Symbol, Hash, Regexp or nil.
`false`(layout: false) is provided as a Hash.
|
|
|
| |
[ci skip]
|
|
|
| |
[ci skip]
|
| |
|
|\
| |
| |
| | |
Use common to_io so users can access the underlying IO object
|
| |
| |
| |
| |
| |
| | |
In some cases users may need to work with/manipulate more of the
Tempfile api than provided by Upload. Allow users to get at the
underlying io via the common to_io method of IO/IO-like objects
|
| |
| |
| |
| | |
Include proper module since AV was extracted form AP as mentioned in #14659.
|
|\ \
| | |
| | | |
Display diagnostics in text format for xhr request
|
| | | |
|
|\ \ \
| | | |
| | | | |
Remove surplus period from assertion messages
|
| | | | |
|
|\ \ \ \
| |_|_|/
|/| | | |
Fix subscriptions not being unsubscribed.
|
| |/ / |
|
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When requesting a controller with the following code with a unknown format:
def my_action
respond_to do |format|
format.json { head :ok }
format.any { render text: 'Default response' }
end
end
we should render the default response instead of raising ActionController::UnknownFormat
Fixes #14462
Conflicts:
actionpack/CHANGELOG.md
actionpack/test/controller/mime/respond_with_test.rb
Conflicts:
actionpack/CHANGELOG.md
|
|/
|
|
|
|
|
| |
References to ``AppName::Application` removed in favour of ``Rails.application``
as generated with a new rails 4.1 app.
[ci skip]
|
|\
| |
| |
| | |
Enhance routing error html page
|
| |
| |
| |
| | |
- also refactored the javascript.
|
| | |
|
| | |
|
|/
|
|
|
|
|
|
|
|
| |
Since `:shallow` may be set at any point in the resource nesting we should
only make the new and collection routes shallow when the parent is shallow.
This is a bit of a hack but until the mapper is refactored to an object graph
instead of a hash of merged values it's the best we can do.
Fixes #14684.
|
|
|
|
|
| |
This parsing is unecessary once the Request object already has the
needed information.
|
| |
|
| |
|
| |
|
| |
|
|
|
| |
- accepts_nested_attribute_for -> accepts_nested_attributes_for
|
|\
| |
| | |
append link to bad code when error type is SyntaxError
|
| | |
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
THe match documentation doesn't mention any requirement of the
parameter name requirement for matches. However, including a
bare glob character without a variable assignment causes a
parse error.
|
| |/
|/| |
|
| | |
|
| | |
|
| |
| |
| |
| | |
Closes #8513
|
|\ \
| | |
| | |
| | |
| | | |
Fortisque/kevin/stream_error_in_main_thread_if_not_committed
re-raise error if error occurs before committing in streaming
|
| | |
| | |
| | |
| | | |
update the tests, using an if-else
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
The method `shallow?` returns false if the parent resource is a singleton so
we need to check if we're not inside a nested scope before copying the :path
and :as options to their shallow equivalents.
Fixes #14388.
|
| |
| |
| |
| |
| |
| | |
avoid freezing the headers until the web server has actually read data
from the body proxy. Once the webserver has read data, then we should
throw an error if someone tries to set a header
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
when streaming responses, we need to make sure the cookie jar is written
to the headers before returning up the stack. This commit introduces a
new method on the response object that writes the cookie jar to the
headers as the response is committed. The middleware and test framework
will not write the cookie headers if the response has already been
committed.
fixes #14352
|
|\ \
| | |
| | | |
Add documentation for original_fullpath. [ci skip]
|
| | | |
|
|\ \ \
| | | |
| | | | |
Replace additional instances of map.flatten with flat_map
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If the options :shallow_prefix and :shallow_path are not set in the
scope options then copy them from the normal :as and :path options
if they are set.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If a developer has specified either :path or :as in the options hash then
these should be used as the defaults for :shallow_path and :shallow_prefix.
Fixes #14241.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
By tracking the depth of resource nesting we can push the need for nested
shallow scoping to only those routes that are nested more than one deep.
This allows us to keep the fix for #12498 and fix the regression in #14224.
Fixes #14224.
|