| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
as the last element of the array
|
|\
| |
| | |
Exceptions raised when using ActionController::Live cause server crash
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Any exceptions that occured at the view or controller level for a
controller using ActionController::Live would cause the server to either
hang with an open socket indefinitely, or immediately crash (depending
on whether the server was launched with rails s or directly). Changed
the behavior of exceptions to act the same as streaming templates for
html requests, and allow for an on_error callback if needed.
|
| |
| |
| |
| |
| |
| |
| |
| | |
If a file field tag is passed the multiple option, it is turned into an
array field (appending "[]"), but if the file field is passed an
explicit name as an option, leave the name alone (do not append "[]").
Fixes #9830
|
| | |
|
| | |
|
|\ \
| | |
| | | |
Add block support for the mail_to helper
|
| | | |
|
| | |
| | |
| | |
| | | |
Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
trevorturk/remove-fixme-comments-about-legacy-key-generator
Remove comments about removing LegacyKeyGenerator in 4.1
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | | |
routing bugfixes when matching multiple paths
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Closes #9913.
We need to expand the match shorthand syntax for every path.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This problem was introduced with:
https://github.com/rails/rails/commit/d03aa104e069be4e301efa8cefb90a2a785a7bff
|
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Closes #10071
`#normalize_path!` depends on the options so we need to call
`#normalize_options!` first to make sure everything is set correctly.
|
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We don't actually need a rails.png in the AP fixtures, the tests
that use it don't actually try to load the file.
We also don't need to get rid of it with the dummy reset either.
Finally, it's not needed in the sample application that's included
with the Rails Guides.
|
|\ \ \
| | | |
| | | | |
Rename DummyKeyGenerator -> LegacyKeyGenerator
|
| | | | |
|
|/ / / |
|
| | | |
|
| | | |
|
|\ \ \
| | | |
| | | | |
Cookie-base session store auto-upgrade
|
| | | |
| | | |
| | | |
| | | | |
Automatically configure cookie-based sessions to use the best cookie jar given the app's config
|
|\ \ \ \
| | | | |
| | | | | |
Revert grep to select since they are not the same
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Added a regression test that will fail if anyone tries to change
time_zone_select to use grep again thinking it will work when it does
not.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
A previous commit swapped out a call to select for a call to grep in
time_zone_options_for_select. This behavior actually causes the
regexp priority option to stop working.
ActiveSupport::TimeZone overrides the =~ operator which is what the
select block was using previously. Enumerable#grep
checks pattern === element and in this case that would be /US/ ===
ActiveSupport::TimeZone which does not work because
ActiveSupport::TimeZone does not supply an implicit converting to_str
method, only an explicit to_s method.
It would be impossible to provide a to_str method that behaves
identically to the =~ method provided on ActiveSupport::TimeZone
so the only option is to revert back to using select with =~.
|
|\ \ \ \ \
| | | | | |
| | | | | | |
fix request methods test
|
| | | | | | |
|
|/ / / / / |
|
| |/ / /
|/| | | |
|
|/ / / |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
lucisferre/improve-layout-override-fallback-behavior
Provides standard layout lookup behavior for method and proc cases
Conflicts:
actionpack/CHANGELOG.md
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When setting the layout either by referencing a method or supplying a
Proc there is no way to fall back to the default lookup behavior if
desired. This patch allows fallback to the layout lookup behavior when
returning nil from the proc or method.
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
* Fix named route collision in mount test fixture
* Update controller named route precedence test
|
| | |
| | |
| | |
| | | |
signed cookies generated by Rails 3 to avoid invalidating them when upgrading to Rails 4
|
|\ \ \
| | | |
| | | | |
Raise an ArgumentError when a clashing named route is defined
|
| | | | |
|
| | | | |
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
Fix missing action_missing
Conflicts:
actionpack/CHANGELOG.md
|
| | | |
| | | |
| | | |
| | | |
| | | | |
A recent change introduced the assumption that all controller actions
are known beforehand, which is not true when using action_missing.
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If the host in `default_url_options` is accidentally set with a protocol such as
```
host: "http://example.com"
```
then the generated url will have the protocol twice `http://http://example.com` which is not what the user intended. Likely they wanted to define a host `host: "example.com"` and a `protocol: "http://"` but did not know the convention.
This may not the most common problem, but when it happens it can go undetected for a while. I accidentally added `http://` out of habit recently only to find all the links in my emails were broken after deploying a demo site to production. Rather than allow this accident go undetected, we can fix the problem in line by properly setting the protocol and host.
I was able to find this related question on stack overflow: http://stackoverflow.com/questions/5878329/rails-3-devise-how-do-i-make-the-email-confirmation-links-use-secure-https-n where the answer was highly upvoted.
This is based off of work in #7415 cc/ @pixeltrix
ATP Action Mailer and Action Pack
|
| | | |
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | | |
* master-sec:
fix protocol checking in sanitization [CVE-2013-1857]
JDOM XXE Protection [CVE-2013-1856]
fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]
stop calling to_sym when building arel nodes [CVE-2013-1854]
|
| | | |
|
| | | |
|
|\ \ \
| | | |
| | | | |
i18n locale fallback for localized views
|
| | | | |
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | | |
Fix rake test warnings in actionpack
|