| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| | |
Add NumberHelper missing dependency
|
|/
|
| |
symbolize_keys depends on hash/keys AS core extension
|
|
|
|
|
|
|
|
|
|
| |
Attempt to fix travis error on 1.8.7/1.9.2:
$ bundle install --path vendor/bundle
ERROR: Gem bundler is not installed, run `gem install bundler` first.
The command "bundle install --path vendor/bundle" failed and exited
with 127 during install.
|
| |
|
|\
| |
| |
| |
| | |
gaynetdinov/replace_undefined_abcs_to_config_variable
Undefined abcs variable inside structure:dump task.
|
|/ |
|
|
|
|
| |
Backport of #6197 in 29d564add926307fea8cd3f77caf88d735e252a1.
|
|
|
|
|
|
| |
blakesmith/connection_adapters_without_explain_support
Don't run explain on slow queries for database adapters that don't support it
|
|
|
|
|
|
|
|
|
| |
This reverts commit 8905c1fb496641c3cdb7b3b816ae6d3d4b2c2b73.
Closes #8460
Conflicts:
activerecord/test/cases/dirty_test.rb
|
|
|
|
| |
Add a test case to ensure that fractional second updates are detected.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Ruby 1.9 freezes Hash string keys by default so where a route is
defined like this:
get 'search' => 'search'
then the Mapper will derive the action from the key. This blows up
later when the action is added to the parameters hash and the
encoding is forced.
Closes #3429
|
| |
|
| |
|
|
|
|
|
|
| |
force response body to be read in assert_template
Conflicts:
actionpack/lib/action_controller/test_case.rb
|
|\
| |
| | |
Fixes #8631 request post? detection should remain unaffected by local inflections such as POS for Point Of Sale
|
|/
|
|
| |
dispatch logic
|
|\
| |
| | |
Make tests for the presence of MiniTest consistent
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There is an inconsistency between the conditional logic in
the definition of ActiveSupport::TestCase and the conditional logic in
ActiveSupport::Testing::SetupAndTeardown [1].
In some circumstances, it's possible for MiniTest to be defined, but
for ActiveSupport::TestCase *not* to have MiniTest::Unit::TestCase or
MiniTest::Assertions in its ancestor chain. e.g. in Ruby 1.8 with the
minitest gem included in the bundle. In this case, the
Test::Unit/MiniTest shim/wrapper is not present and so
Test::Unit::TestCase (and therefore ActiveSupport::TestCase) is
completely independent of MiniTest::Unit::TestCase.
The conditional logic in the definition of ActiveSupport::TestCase does
not take this scenario into account, whereas the logic in
ActiveSupport::Testing::SetupAndTeardown does take it into account.
The changes in this commit are an alternative to the change in [2] which
was reverted in [3].
Similar conditional logic exists in ActiveSupport::Testing::Isolation
[4], ActiveSupport::Testing::Pending [5],
ActiveSupport::Testing::Performance [6], and in their respective tests.
I have not addressed these, because I know less about what's going on
there, but it would be worth bringing them all into line too.
[1]
https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/setup_and_teardown.rb#L13
[2]
https://github.com/rails/rails/commit/c3e186ec8dcb2ec26d5d56f3e89123b1350c4a6f
[3]
https://github.com/rails/rails/commit/267fb61277ac960ad443d239febcb3136a007d24
[4]
https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/isolation.rb#L41
[5]
https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/pending.rb#L14
[6]
https://github.com/rails/rails/blob/3-2-stable/activesupport/lib/active_support/testing/performance.rb#L17
|
| |
| |
| |
| |
| |
| | |
Remove header bloat introduced by BestStandardsSupport middleware
Conflicts:
actionpack/CHANGELOG.md
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This has been resulting in some hard to track bugs and is introducing
a possible breackage in a stable version. The issue it currently "fixes"
should be handled in some other way.
Closes #8743. Related to #7983.
|
| | |
| | |
| | |
| | | |
This reverts commit 06cc38a2b0d4778746e8a2a2e2b6aa07e1c1c075.
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 88a296dccc401da143d90cad54b693ff06bf2b58, reversing
changes made to 666a7e34f553cef4c8878362eafc79c7e3f310c3.
Conflicts:
activerecord/CHANGELOG.md
Reason: this has been resulting in some hard to track bugs and is
introducing a possible breackage in a stable version.
|
| | |
|
|/ |
|
|\
| |
| | |
Fix DateTime comparison with DateTime::Infinity object
|
| |
| |
| |
| | |
Closes #8587
|
|/ |
|
|
|
|
| |
Fix regression introduced in pull 8812
|
| |
|
|\
| |
| | |
Revert hm:t on unsaved collection for 3.2
|
|/
|
|
|
|
|
| |
This reverts commit ee439895759b38431ad025f3c234831f30dadcdb.
It would appear that #7661 had unintended consequences to the API. Until
we can sort those out, this should not be in 3.2.x, and wait for 4.0.0.
|
|\
| |
| | |
3-2-stable: Fix JSON params parsing regression for non-object JSON content.
|
|/
|
|
| |
Backports #8855.
|
|
|
|
| |
Duplicated entry added in 002dfba66490d289bac897d1ba886310a672e779.
|
|\
| |
| | |
Fix javascript_include_tag when no js runtime is available
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In a production environment where the assets have been precompiled, we
don't want an assets compile step to happen on the application server at
all. To ensure this, a js runtime may not be available on the app
servers. In this environment, pages using javascript_include_tag for
assets with non-standard or chained extensions were throwing 500 errors.
For instance, `javascript_include_tag('jquery.min')` would blow up.
Sprockets was attempting to build the assets being included during the
rewrite_extension step (responsible for appending a '.js' extension to
assets being included by the basename rather than a fully qualified
name). This was happening as a step to resolve #6310, which required
checking for the presence of an asset with a non-standard extension
before appending the extension.
We can check for the presence of an asset without invoking the asset
build step by using Sprockets' resolve method, which will search for the
base file without building it (and is the method that find_asset uses
internally to get the path to the asset before attempting to build it).
When rewriting the extension on an asset, these are the steps:
- If the source does not have an extension, assume that the default
extension is desired and append it.
- If there is an extension and it doesn't match the default extension,
check to see if a file with the precise name specified exists amongst
the assets; if it is present, do not append the default extension.
(This is the step that resolves #6310).
|
|\ \
| | |
| | | |
Ensure assets aren't duplicated when using sprockets require.
|
|/ /
| |
| |
| |
| | |
- addresses the problem by calling flatten on asset array before calling uniq.
- adds note to CHANGELOG.
|
| | |
|
|\ \
| | |
| | |
| | | |
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.
Conflicts:
activerecord/lib/active_record/log_subscriber.rb
activerecord/test/cases/log_subscriber_test.rb
Conflict resolution:
- Revert ruby 1.9 style hash to support ruby 1.8
- Do not include 8f59ffce into 3-2-stable
|
|\ \ \
| |/ /
|/| | |
Remove test for XML YAML parsing
|
|/ /
| |
| |
| |
| | |
The support for YAML parsing in XML has been removed from Active Support
since it introduced an security risk. See 43109ec for more detail.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 3-2-sec:
bumping version
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
Avoid Rack security warning no secret provided
Conflicts:
actionpack/CHANGELOG.md
activerecord/CHANGELOG.md
activesupport/CHANGELOG.md
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
dealing with empty hashes. Thanks Damien Mathieu
|
| | |
| | |
| | |
| | | |
This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie."
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
Conflicts:
actionpack/actionpack.gemspec
|