| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|/ / |
|
| |
| |
| |
| |
| |
| |
| | |
Make sure inverse_of is visible on the has_many callbacks
Conflicts:
activerecord/CHANGELOG.md
activerecord/test/models/company.rb
|
| |
| |
| |
| |
| |
| |
| | |
Fix FileStore#cleanup to no longer rely on missing each_key method
Conflicts:
activesupport/CHANGELOG.md
activesupport/test/caching_test.rb
|
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes table.joins(:relation).last(N) breaking on sqlite
Conflicts:
activerecord/CHANGELOG.md
activerecord/test/cases/finder_test.rb
|
|\ \
| | |
| | | |
PR #5219 backported to 3-2
|
| |/
| |
| |
| | |
constraints have access
|
|\ \
| |/
|/| |
on SchemaCache use the connection getter instead of the obj given
|
|/ |
|
|
|
|
|
|
| |
Comply with current umask when generating new app
Conflicts:
railties/lib/rails/generators/rails/app/app_generator.rb
|
|\
| |
| | |
Render with context format
|
|/ |
|
| |
|
|\
| |
| | |
Fix test incompatible with 1.8.7
|
|/ |
|
|
|
|
|
|
| |
Conflicts:
railties/guides/rails_guides.rb
railties/lib/rails/tasks/documentation.rake
|
|\
| |
| | |
Load fixtures from linked folder
|
|/ |
|
| |
|
|
|
|
| |
quote_value is called on the object not the class
|
|
|
|
|
|
|
|
|
|
| |
This includes fixing typos in changelog, removing a deprecated
mocha/setup test require, and preferring the `column_for_attribute`
accessor over direct access to the columns_hash in the new code.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/locking/optimistic.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When calling quote_value the underlying connection sometimes requires
more information about the column to properly return the correct quoted
value.
I ran into this issue when using optimistic locking in JRuby and the
activerecord-jdbcmssql-adapter. In SQLSever 2000, we aren't allowed to
insert a integer into a NVARCHAR column type so we need to format it as
N'3' if we want to insert into the NVARCHAR type. Unfortuantely, without
the column type being passed the connection adapter cannot properly return
the correct quote value because it doesn't know to return N'3' or '3'.
This patch is fairly straight forward where it just passes in the column
type into the quote_value, as it already has the ability to take in the column,
so it can properly handle at the connection level.
I've added the tests required to make sure that the quote_value method
is being passed the column type so that the underlying connection can
determine how to quote the value.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/locking/optimistic.rb
|
|\
| |
| |
| |
| | |
90yukke/fix-nomethoderror-on-non-attribute-equalities
Fix merge error when Equality LHS is non-attribute.
|
|/
|
|
| |
This is reworking of rails/rails/pull/7380 made for rails 3.
|
|
|
|
| |
It was included by git on the wrong release
|
|\ |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
jetthoughts/11450_do_not_resave_destroyed_association
Do not re-save destroyed association on saving parent object
Conflicts:
activerecord/lib/active_record/autosave_association.rb
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Journey doesn't clear its named route hash when the routes are reloaded but
Rails 3.2 isn't affected because Journey overwrites the existing route. This
is just a backport of the test to make sure it doesn't become affected in
some future release.
|
|\ \
| | |
| | |
| | |
| | | |
wolframarnold/3-2-stable_fix_respond_to_missing_in_tagged_loggging
3-2-stable patch: Add respond_to_missing? in TaggedLoggging
|
| | |
| | |
| | |
| | |
| | |
| | | |
abstracter wraps a TaggedLogging instance.
It's also best practice when overriding method_missing.
|
|\ \ \
| | | |
| | | | |
Fix #10842. `assert_redirected_to` does not show user-supplied message.
|
|/ / /
| | |
| | |
| | |
| | |
| | | |
Issue: when `assert_redirected_to` fails due to the response redirect not
matching the expected redirect the user-supplied message (second parameter)
is not shown. This message is only shown if the response is not a redirect.
|
|\| |
| | |
| | | |
Removed unused test file
|
|/ /
| |
| |
| | |
This test file is not be running from a long time
This test is already covered in controller/caching_test.rb
|
| | |
|
|/
|
|
|
|
|
|
|
|
|
| |
jetthoughts/11450_do_not_resave_destroyed_association
Do not re-save destroyed association on saving parent object
Conflicts:
activerecord/lib/active_record/autosave_association.rb
Conflicts:
activerecord/CHANGELOG.md
|
|
|
|
|
|
|
|
|
|
| |
If the DateTime core extensions were loaded before the Date core extensions
then you would get a superclass mismatch as DateTime hasn't been defined
yet so it gets set to Object by the acts_like core extension.
Fixes #11206
(cherry picked from commit 78f7d5b652000dbb1a11d34fe370c3fa82de840c)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The standard Ruby behavior for Time.at is to return the same type of
time when passing an instance of Time as a single argument. Since the
an ActiveSupport::TimeWithZone instance may be a different timezone than
the system timezone and DateTime just understands offsets the best we
can do is to return an instance of Time with the correct offset.
It also maintains the correct fractional second value as well.
Fixes #11350.
Backports:
484253515c0e05760541dc48946361185c9e6904
1b3873730b96035a238dbff7627bd5942e6dc4e7
|
|
|
|
|
|
|
| |
when result_error_field is not defined on result raise the original
exception.
Fixes #11260
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
The connection url parssing don't accept the socket option
|