aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \
| * | | | | | | | Freeze default empty string for sql_type in get_oid_typeBenoit Tigeot2017-01-221-1/+1
* | | | | | | | | Merge pull request #27855 from kevinzwhuang/finder-methods-typo-fixEileen M. Uchitelle2017-01-311-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix grammar typo about sort in finder_methods.rbKevin Huang2017-01-301-2/+2
* | | | | | | | | | Merge pull request #27857 from kenta-s/add-test-for-variable_size_secure_compareEileen M. Uchitelle2017-01-311-1/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Add test for `variable_size_secure_compare`kenta-s2017-01-311-1/+6
* | | | | | | | | | Merge pull request #27856 from kenta-s/remove-redundant-right-parenthesesप्रथमेश Sonpatki2017-01-311-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove redundant right parentheses in number_helper [ci skip]kenta-s2017-01-311-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #27838 from kamipo/reload_destroyed_through_recordRafael França2017-01-312-0/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Reload `through_record` that has been destroyed in `create_through_record`Ryuta Kamizono2017-01-292-0/+11
* | | | | | | | | Raise in the initialize not in the executeRafael Mendonça França2017-01-313-13/+12
* | | | | | | | | Merge pull request #27824 from kenta-s/raise-an-error-if-no-block-givenRafael França2017-01-313-2/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Raise an error if FileUpdateChecker#execute is called with no blockkenta-s2017-01-283-2/+17
* | | | | | | | | | Don't mutate raw_source in mailer preview interceptorEugene Kenny2017-01-302-5/+35
* | | | | | | | | | Merge pull request #27849 from joevandyk/patch-2Rafael França2017-01-311-1/+2
* | | | | | | | | | Merge pull request #27853 from y-yagi/add_default_value_to_deliver_later_queu...Rafael França2017-01-311-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add default value to `deliver_later_queue_name` option [ci skip]yuuji.yaginuma2017-01-311-1/+1
* | | | | | | | | | | Merge pull request #27738 from kenta-s/remove-unused-argument-formatsRafael França2017-01-312-27/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove unused argument `formats`kenta-s2017-01-202-27/+27
* | | | | | | | | | | | Merge pull request #27842 from richseviora/masterRafael França2017-01-312-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added warning for reserved YAML keywords.Rich Seviora2017-01-302-0/+39
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #27647 from Shopify/fully-eagerload-journeyRafael França2017-01-306-1/+45
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fully initialize routes before the first request is handledJean Boussier2017-01-186-1/+45