aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #14363 from arthurnn/usec_tests_mysql56Rafael Mendonça França2014-03-122-3/+10
|\ \ \ \ | |/ / / |/| | | Add more tests for mysql 5.6 microseconds + Fix tests
| * | | Change usec to 0 on tests that compare secondsArthur Neves2014-03-121-3/+3
| | | | | | | | | | | | | | | | | | | | Avoid rounding problems with `.usec` method rounding the seconds when the field doesn't persist the `.usec` piece.
| * | | Unit test for mysql quote time usecArthur Neves2014-03-121-0/+7
|/ / /
* | | Merge pull request #13040 from kamipo/case_sensitive_comparisonRafael Mendonça França2014-03-126-6/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Only use BINARY for mysql case sensitive uniqueness check when column has a case insensitive collation. Conflicts: activerecord/CHANGELOG.md
| * | | Only use BINARY for mysql case sensitive uniqueness check when column has a ↵Ryuta Kamizono2013-11-266-6/+62
| | | | | | | | | | | | | | | | case insensitive collation.
* | | | Merge pull request #14359 from arthurnn/mysql2_56_franc_secRafael Mendonça França2014-03-125-2/+23
|\ \ \ \ | | | | | | | | | | MySQL 5.6 Fractional Seconds
| * | | | Changelog entry for mysql56 microsecondsArthur Neves2014-03-121-0/+4
| | | | |
| * | | | Test microsecond on mysql 5.6Arthur Neves2014-03-123-2/+11
| | | | |
| * | | | MySQL 5.6 and later supports microsecond precision in datetime.Tatsuhiko Miyagawa2014-03-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | You might want to branch it to include this only for 5.6, but passing these values to < 5.6 doesn't cause issues either.
* | | | | Merge pull request #14291 from laurocaetano/doc-for-original-fullpathYves Senn2014-03-121-0/+7
|\ \ \ \ \ | |/ / / / |/| | | | Add documentation for original_fullpath. [ci skip]
| * | | | [ci skip] Add documentation for original_fullpath.Lauro Caetano2014-03-111-0/+7
| | | | |
* | | | | Merge pull request #14353 from arthurnn/remove_small_mockRafael Mendonça França2014-03-111-3/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove mocking on save, when not necessary
| * | | | | Remove mocking on save, when not necessaryArthur Neves2014-03-111-3/+1
|/ / / / /
* | | | | Merge pull request #14345 from arthurnn/revert_14052Godfrey Chan2014-03-112-3/+16
|\ \ \ \ \ | | | | | | | | | | | | Fixes STI when 2+ levels deep.
| * | | | | Fixes STI when 2+ levels deep.Arthur Neves2014-03-102-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #14052 Added a regression where it was only looking for methods in one level up, So when the method was defined in a 2+ levels up the inheritance chain, the method was not found as defined.
* | | | | | comment why we are modifying global state. [ci skip]Yves Senn2014-03-111-0/+1
| | | | | |
* | | | | | `change_table` supports `citext`. Follow up to #12523.Yves Senn2014-03-112-8/+31
| | | | | |
* | | | | | Merge pull request #12523 from lsylvester/pg_citextYves Senn2014-03-116-2/+89
|\ \ \ \ \ \ | | | | | | | | | | | | | | Support for PostgreSQL citext data type.
| * | | | | | register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester]lsylvester2014-03-116-2/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | citext makes it possible to use AR Hash finders for case-insensitive matching as sql UPPER/LOWER functions are not needed.
* | | | | | | Merge pull request #14342 from ↵Jeremy Kemper2014-03-107-110/+136
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zuhao/eliminate_global_state_leak_in_activemodel_tests Eliminate global state leaks completely in ActiveModel tests
| * | | | | | | Completely remove potential global state leaks in ActiveModel tests.Zuhao Wan2014-03-117-110/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveModel tests can now be run in random order.
* | | | | | | | Merge pull request #11616 from arunagw/removed-application-command-railsCarlos Antonio da Silva2014-03-102-6/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Removed command "application"
| * | | | | | | Removed unnecessary command "application"Arun Agrawal2014-03-102-6/+5
|/ / / / / / /
* | | | | | | Merge pull request #14343 from garysweaver/masterVijay Dev2014-03-101-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | minor fix to 4.1 rel notes for begin_transaction joinable option
| * | | | | | minor fix to 4.1 rel notes for begin_transaction joinable option [CI skip]Gary S. Weaver2014-03-101-1/+1
|/ / / / / /
* | | | | | Merge pull request #8313 from alan/only_save_changed_has_one_objectsRafael Mendonça França2014-03-103-2/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save has_one associations only if record has changes Conflicts: activerecord/CHANGELOG.md
| * | | | | | Save has_one associations only if record has changesAlan Kennedy2013-10-313-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents save related callbacks such as `after_commit` being triggered when `has_one` objects are already persisted and have no changes.
* | | | | | | current_adapter? accepts multiple argumentsRafael Mendonça França2014-03-101-2/+2
| | | | | | |
* | | | | | | mysql adapter also fails with a number bigger than intRafael Mendonça França2014-03-101-2/+5
| | | | | | |
* | | | | | | The 4.1 release notes is already a thing so lets show in the guidesRafael Mendonça França2014-03-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | links
* | | | | | | Change the assertions depending in the database adapterRafael Mendonça França2014-03-101-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will avoid the confusing flunk logic
* | | | | | | Do proper adapter checkRafael Mendonça França2014-03-101-2/+2
| | | | | | |
* | | | | | | WhitespacesRafael Mendonça França2014-03-101-2/+2
| | | | | | |
* | | | | | | Merge pull request #14341 from keikun17/masterYves Senn2014-03-101-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix minor typo 'fields_for'. [ci skip]
| * | | | | | | Fix 'fields_for' doc typo.Cakey | Buddy Magsipoc2014-03-101-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #14332 from tgxworld/autosave_association_testYves Senn2014-03-101-7/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | Delete instances of Parrot after each test.
| * | | | | | Cleanup Parrot after each test.Guo Xiang Tan2014-03-091-7/+3
|/ / / / / /
* | | | | | Merge pull request #14334 from kennym/masterGodfrey Chan2014-03-091-4/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Enhance readability of ActionView DateHelper#distance_of_time_in_words
| * | | | | | Enhance readability of ActionView DateHelper#distance_of_time_in_wordsKenny Meyer2014-03-091-4/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor numerical constants to module constants which give the numbers a contextual meaning. This commit aims to provide quicker understanding for part of the implementation of the DateHelper#distance_of_time_in_words method.
* | | | | | Merge pull request #14315 from zuhao/activemodel_tests_in_random_orderYves Senn2014-03-094-13/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | Run ActiveModel test suites in random order.
| * | | | | | Run ActiveModel test suites in random order.Zuhao Wan2014-03-104-13/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets the whole ActiveModel test suites working even if `self.i_suck_and_my_tests_are_order_dependent!` is disabled in `ActiveSupport::TestCase`. Two places are found that potentially leak global state. This patch makes sure states are restored so that none of the changes happen in a single test will be carried over to subsequence tests.
* | | | | | | Merge pull request #14262 from sferik/flat_mapAndrew White2014-03-0916-30/+30
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Replace additional instances of map.flatten with flat_map
| * | | | | | Replace map.flatten with flat_map in railtiesErik Michaels-Ober2014-03-044-4/+4
| | | | | | |
| * | | | | | Replace map.flatten with flat_map in activerecordErik Michaels-Ober2014-03-035-8/+8
| | | | | | |
| * | | | | | Replace map.flatten with flat_map in actionpackErik Michaels-Ober2014-03-037-18/+18
| | | | | | |
* | | | | | | Move changelog entry to the top, highlight module name [ci skip]Carlos Antonio da Silva2014-03-081-5/+6
| | | | | | |
* | | | | | | Copy shallow options from normal options when using scopeAndrew White2014-03-082-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Pull namespace defaults out of the options hashAndrew White2014-03-082-3/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Only use shallow nested scope when depth is > 1Andrew White2014-03-082-20/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Move setting :scope_level_resource to resource_scopeAndrew White2014-03-081-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally with_scope_level was exclusively for managing scope levels with resources, however it is now used for other things so it makes more sense to move the responsibility for setting the :scope_level_resource to the resource_scope method. This eliminates repeatedly setting it to the same resource as each resource method scope is evaluated.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 18:41:12 +0000