aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | 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
* | | | | | explicitly require `listen` in `EventedFileUpdateCheckerTest` (#27867)Arthur Nogueira Neves2017-02-011-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | explicitly require `listen` in `EventedFileUpdateCheckerTest`yuuji.yaginuma2017-02-011-0/+1
* | | | | | Merge pull request #27869 from y-yagi/call_gem_before_require_erubisMatthew Draper2017-02-011-0/+1
|\ \ \ \ \ \
| * | | | | | call `gem` `erubis` before requireyuuji.yaginuma2017-02-011-0/+1
|/ / / / / /
* | | | | | Merge pull request #27866 from y-yagi/remove_unused_variableRafael França2017-01-311-1/+1
|\ \ \ \ \ \
| * | | | | | remove unused variableyuuji.yaginuma2017-02-011-1/+1
| |/ / / / /
* | | | | | Merge pull request #27795 from meagar/fix-missing-partial-iterationRafael França2017-01-314-1/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into fix-missing-partial-iterationMatthew Eagar2017-01-266-7/+10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fix-missing-partial-iterationMatthew Eagar2017-01-2522-105/+221
| |\ \ \ \ \ \
| * | | | | | | Add partial iteration variable to template keysMatthew Eagar2017-01-254-1/+12
* | | | | | | | Merge pull request #27836 from kamipo/has_many_through_with_scope_should_resp...Rafael França2017-01-316-5/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Chain scope constraints should respect own table aliasRyuta Kamizono2017-02-016-5/+41
* | | | | | | | | correctly set test adapter when configure the queue adapter on a per job (#26...Yuji Yaginuma2017-01-315-10/+62
|/ / / / / / / /
* | | | | | | | Merge pull request #27859 from yahonda/diag27826Rafael França2017-01-312-11/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Add sqlite3_mem adapter to Travis CIYasuo Honda2017-01-311-0/+3
| * | | | | | | | Use temporary connection pool for sqlite3_mem adapterYasuo Honda2017-01-311-11/+22
* | | | | | | | | Remove deprecated callbacks from ActionDispatch middlewaresRafael Mendonça França2017-01-317-163/+70
* | | | | | | | | Merge pull request #27850 from apauly/feature/active_job_test_helperRafael França2017-01-313-7/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Append skipped jobs to enqueued_jobsAlexander Pauly2017-01-313-7/+18
* | | | | | | | | | Merge pull request #27858 from mtsmfm/fix-inherit-from-deprecated-erubisRafael França2017-01-313-1/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix inherit from deprecated `ActionView::Template::Handlers::Erubis`Fumiaki MATSUSHIMA2017-02-013-1/+12
* | | | | | | | | | | Merge pull request #27758 from kenta-s/neglected-todo-in-render_testArthur Nogueira Neves2017-01-311-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Get neglected TODO done in render_testkenta-s2017-01-241-2/+1
* | | | | | | | | | | | Merge pull request #27767 from benoittgt/freeze_sql_type_with_get_oid_typeArthur Nogueira Neves2017-01-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \