| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| |
| |
| |
| | |
adapter.
Because Oracle adapter supports only remove_column :table_name, :column_name syntax
and it has never supported remove_column :table_name, [:column_name].
|
| |
| |
| |
| |
| | |
Similarly to 6525002, this allows to use routes helpers for mounted
helpers, but this time in ActionView::TestCase
|
|\ \
| | |
| | | |
Correct the use of to_model in polymorphic routing
|
| |/ |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In integration tests, you might want to use helpers from engines that
you mounted in your application. It's not hard to add it by yourself,
but it's unneeded boilerplate. mounted_helpers are now included by
default. That means that given engine mounted like:
mount Foo::Engine => "/foo", :as => "foo"
you will be able to use paths from this engine in tests this way:
foo.root_path #=> "/foo"
(closes #6573)
|
|\ \
| |/
|/| |
Backporting #6586 patch to 3-2-stable
|
|/ |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A series of commits relating to preloading and scopes caused a regression.
Cloning the relation calls initialize_copy which resets a number of instance
variables to nil. Without this the scope thinks that it is already loaded
when it is called again.
Reverts the following commits:
13f1401a6cf0266a3b0a91b173f976db2d4e50f3
8491740ca5361ba9df20e1c8b906c709f5bfbc12
dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e
Fixes #6575, #6576 & #6577
|
|\
| |
| |
| |
| |
| |
| |
| | |
* 3-2-rel:
bumping to 3.2.4
adding security notifications to CHANGELOGs
updating changelogs
Merge pull request #6558 from parndt/fix_regression
|
| | |
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | | |
* 3-2-stable-sec:
Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
|
| | | |
|
| | |
| | |
| | |
| | | |
Fix regression
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
* 3-2-stable-sec:
Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
bumping to 3.2.4.rc1
|
| | |
| | |
| | |
| | |
| | |
| | | |
Thanks to Ben Murphy for reporting this!
CVE-2012-2660
|
| |/
| |
| |
| |
| |
| | |
Thanks to Ben Murphy for reporting this
CVE-2012-2661
|
| | |
|
|\ \
| | |
| | | |
3-2-stable Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.
|
|/ /
| |
| |
| |
| |
| |
| | |
'therubyracer'.
Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms.
Updating tests.
|
|\ \
| | |
| | | |
Fix regression
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit ebfa58abc895c0639211cb896a47b04e424322c8.
This change caused a regression in my application's tests:
* Failing build http://travis-ci.org/#!/resolve/refinerycms/builds/1461242
Broken tests pass after this change is reverted.
|
| |
| |
| |
| | |
Properly discover a connection is closed in postgresql_adapter
|
|\ \
| | |
| | | |
3 2 stable json patch
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
activesupport/lib/active_support/json/encoding.rb
activesupport/test/json/encoding_test.rb
|
|/ /
| |
| |
| |
| |
| | |
Fix #5797. Error calling dup method on AR model with serialized field
Conflicts:
activerecord/lib/active_record/core.rb
|
|\ \
| | |
| | | |
Display annotations in coffee files
|
| | | |
|
| |/ |
|
|\ \
| |/
|/|
| |
| | |
freerange/3-2-stable-minitest-passthrough-exceptions
Exceptions like Interrupt should not be rescued in tests.
|
|/
|
|
|
| |
This is a back-port of rails/rails#6525. See the commit notes there for
details.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
railites_order method, introduced in 40b19e0, had a bug that was causing
loading application instance twice in initializers if railties_order
already included application instance. So for example
railties_order = [Foo::Engine, :main_app, Bar::Engine]
would result in such railties array:
[MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine]
In order to fix it, we need to check for existence of application in
both railties_order and railties arrays.
|
|\
| |
| | |
memcache require not needed for cache store
|
|/ |
|
|
|
|
| |
Maximum wait_timeout on Windows is 2147483
|
|\
| |
| | |
Quote arguments in db:structure:dump for PostgreSQL.
|
| |
| |
| |
| | |
fixes #5913
|
|\ \
| |/
|/| |
Synchronize the body of the ConnectionPool#release method to improve thread safety.
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
[#6464]
Fixes #6464
Synchronize the contents of the release method in ConnectionPool due to
errors when running in high concurrency environments.
Detected invalid hash contents due to unsynchronized modifications
with concurrent users
org/jruby/RubyHash.java:1356:in `keys'
/usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a
ctive_record/connection_adapters/abstract/connection_pool.rb:294:in
`release'
/usr/local/rvm/gems/jruby-1.6.7@new_import/gems/activerecord-3.2.3/lib/a
ctive_record/connection_adapters/abstract/connection_pool.rb:282:in
`checkin'
|
|\
| |
| |
| |
| | |
chancancode/3-2-stable_restore_frozen_state_on_rollback
Fixes the build break caused by 9ee8528 in #6445.
|
|/
|
|
|
|
|
|
| |
Ruby 1.8 raises a TypeError when trying to modify a frozen Hash, while
Ruby 1.9 raises a RuntimeError instead. Also, Ruby < 1.9.3 uses a
lowercase 'hash' in the exception message while Ruby >= 1.9.3 uses an
uppercase 'Hash' instead. This commit normalizes those issues in the
test case.
|
|\
| |
| |
| |
| | |
chancancode/3-2-stable_restore_frozen_state_on_rollback
Restore the frozen state on rollback. (Backports #6420)
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is a 3-2-stable backport for #6420 which was merged into master.
Currently, when saving a frozen record, an exception would be thrown
which causes a rollback. However, there is a bug in active record that
"defrost" the record as a side effect:
>> t = Topic.new
=> #<Topic id: nil, ...>
>> t.freeze
=> #<Topic id: nil, ...>
>> t.save
RuntimeError: can't modify a frozen Hash
>> t.frozen?
=> false
>> t.save
=> true
This patch fixes the bug by explictly restoring the frozen state on the
attributes Hash after every rollback.
|
|
|
|
|
|
|
| |
Using require in development mode will prevent required files from
reloading, even if they're changed. In order to keep namespaced
application_controller reloadable, we need to use require_dependency
instead of require.
|
|\
| |
| | |
Postgresql doesn't accept limits on binary (bytea) columns (for 3-2-stable)
|
| | |
|
|\ \
| | |
| | | |
assets: don't add extension if other given and file exists
|