aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #27933 from kamipo/revert_27682Jeremy Daer2017-02-072-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Remove useless `column_alias` in `subquery_for_count`"Ryuta Kamizono2017-02-072-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #27334 from kamipo/pk_and_ref_columns_should_be_identical_...Jeremy Daer2017-02-0712-31/+79
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | `primary_key` and `references` columns should be identical typeRyuta Kamizono2017-02-0712-31/+79
* | | | | | | | | | | Merge pull request #27922 from martijn/reduce-actioncable-loggingJeremy Daer2017-02-072-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move some ActionCable logs to debug levelMartijn Storck2017-02-062-2/+2
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #26378 from kamipo/decouple_building_arel_ast_for_uniquene...Jeremy Daer2017-02-064-41/+51
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add `:nodoc:` to `case_sensitive_comparison` and `case_insensitive_comparison`Ryuta Kamizono2017-01-202-3/+3
| * | | | | | | | | | | Decouple the building Arel ASTs for uniqueness validatorRyuta Kamizono2016-12-254-38/+48
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Remove useless `column_alias` in `subquery_for_count`Ryuta Kamizono2017-02-062-5/+5
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #27389 from kamipo/fix_mysql_pk_dumping_correctlyJeremy Daer2017-02-0611-236/+191
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Restore custom primary key tests lost at #26266Ryuta Kamizono2017-02-041-25/+43
| * | | | | | | | | | Restore the behaviour of the compatibility layer for integer-like PKsRyuta Kamizono2017-02-046-174/+111
| * | | | | | | | | | Correctly dump integer-like primary key with default nilRyuta Kamizono2017-02-045-40/+40
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #27884 from kamipo/deprecate_migration_keysJeremy Daer2017-02-067-6/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Deprecate `ColumnDumper#migration_keys`Ryuta Kamizono2017-02-077-6/+18
* | | | | | | | | | | Merge pull request #27929 from kamipo/remove_useless_mysql_column_testsJeremy Daer2017-02-061-42/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove useless `MySQL::Column` testsRyuta Kamizono2017-02-071-42/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #27928 from y-yagi/remove_activemodel_testcase_from_libRafael França2017-02-064-6/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Remove `ActiveModel::TestCase` from libyuuji.yaginuma2017-02-074-6/+5
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #27919 from bf4/correct_spellingArthur Nogueira Neves2017-02-0621-29/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Correct spellingBenjamin Fleischer2017-02-0521-29/+29
| |/ / / / / / / /
* | | | | | | | | Merge pull request #27924 from kenta-s/add-test-for-datetime-blankRafael França2017-02-063-0/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Add tests for `blank?`kenta-s2017-02-063-0/+12
|/ / / / / / / /
* | | | | | | | Merge pull request #27902 from kirs/yaml-column-errorKasper Timm Hansen2017-02-064-10/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Indicate action that failed in YamlColumnKir Shatrov2017-02-054-10/+10
| |/ / / / / /
* | | | | | | Merge pull request #27900 from y-yagi/add_arg_key_to_process_action_mailer_eventKasper Timm Hansen2017-02-053-1/+25
|\ \ \ \ \ \ \
| * | | | | | | Add `:args` to `process.action_mailer` eventyuuji.yaginuma2017-02-043-1/+25
| |/ / / / / /
* | | | | | | Merge pull request #27802 from domcleal/27801-multiple-rake-testsKasper Timm Hansen2017-02-053-7/+28
|\ \ \ \ \ \ \
| * | | | | | | Collect all file patterns when running multiple rake test tasksDominic Cleal2017-02-043-7/+28
* | | | | | | | Merge pull request #27898 from jaredbeck/docs_module_delegation_errorEileen M. Uchitelle2017-02-041-7/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Docs: Correction: Module::DelegationErrorJared Beck2017-02-031-7/+9
|/ / / / / / /
* | | | | | | Merge pull request #27896 from meagar/fix-assigns-typo-in-guideEileen M. Uchitelle2017-02-031-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in guide: _articles should be _articleMatthew Eagar2017-02-031-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #27865 from composerinteralia/collection-ids-setter-bugEileen M. Uchitelle2017-02-033-2/+17
|\ \ \ \ \ \ \
| * | | | | | | Fix collection_singular_ids= bugDaniel Colson2017-02-023-2/+17
* | | | | | | | Merge pull request #27881 from koic/fix_test_type_map_lookup_using_oracleEileen M. Uchitelle2017-02-031-6/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix a test of AR::Type::TypeMap#lookup when using OracleKoichi ITO2017-02-021-6/+14
* | | | | | | | | Merge pull request #27891 from y-yagi/ignore_yarn_error_logEileen M. Uchitelle2017-02-032-0/+6
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Ignore yarn error log fileyuuji.yaginuma2017-02-032-0/+6
| |/ / / / / / /
* | | | | | | | Merge pull request #27880 from y-yagi/generate_mailer_layout_files_only_when_...Kasper Timm Hansen2017-02-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | generate mailer layout files only when it does not existyuuji.yaginuma2017-02-021-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #27885 from kamipo/fix_ci_failureAkira Matsuda2017-02-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix CI failure caused by aa647b46cce55ec12f5895e403c0d1b85502c8e0Ryuta Kamizono2017-02-021-1/+1
|/ / / / / / / /
* | | | | | | | Fix test failures only seen when executed via bin/testAkira Matsuda2017-02-021-1/+1
* | | | | | | | Properly escape test namesAkira Matsuda2017-02-021-3/+3
* | | | | | | | module Blog; class Post appears twice in AV testsAkira Matsuda2017-02-021-3/+3
* | | | | | | | DRY fake models for testingAkira Matsuda2017-02-022-37/+7
* | | | | | | | bin/test for Active Job and Action Cable testsAkira Matsuda2017-02-022-0/+8
|/ / / / / / /
* | | | | | | Virtual/generated column support for MySQL 5.7.5+ and MariaDB 5.2.0+Ryuta Kamizono2017-02-0113-28/+170