rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Expand)	Author	Age	Files	Lines
*	Correctly dump integer-like primary key with default nil	Ryuta Kamizono	2017-02-04	5	-40/+40
*	Merge pull request #27896 from meagar/fix-assigns-typo-in-guide	Eileen M. Uchitelle	2017-02-03	1	-1/+1
\|\
\| *	Fix typo in guide: _articles should be _article	Matthew Eagar	2017-02-03	1	-1/+1
\|/
*	Merge pull request #27865 from composerinteralia/collection-ids-setter-bug	Eileen M. Uchitelle	2017-02-03	3	-2/+17
\|\
\| *	Fix collection_singular_ids= bug	Daniel Colson	2017-02-02	3	-2/+17
* \|	Merge pull request #27881 from koic/fix_test_type_map_lookup_using_oracle	Eileen M. Uchitelle	2017-02-03	1	-6/+14
\|\ \
\| * \|	Fix a test of AR::Type::TypeMap#lookup when using Oracle	Koichi ITO	2017-02-02	1	-6/+14
* \| \|	Merge pull request #27891 from y-yagi/ignore_yarn_error_log	Eileen M. Uchitelle	2017-02-03	2	-0/+6
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Ignore yarn error log file	yuuji.yaginuma	2017-02-03	2	-0/+6
\| \|/
* \|	Merge pull request #27880 from y-yagi/generate_mailer_layout_files_only_when_...	Kasper Timm Hansen	2017-02-02	1	-1/+1
\|\ \
\| * \|	generate mailer layout files only when it does not exist	yuuji.yaginuma	2017-02-02	1	-1/+1
\| \|/
* \|	Merge pull request #27885 from kamipo/fix_ci_failure	Akira Matsuda	2017-02-03	1	-1/+1
\|\ \
\| * \|	Fix CI failure caused by aa647b46cce55ec12f5895e403c0d1b85502c8e0	Ryuta Kamizono	2017-02-02	1	-1/+1
\|/ /
* \|	Fix test failures only seen when executed via bin/test	Akira Matsuda	2017-02-02	1	-1/+1
* \|	Properly escape test names	Akira Matsuda	2017-02-02	1	-3/+3
* \|	module Blog; class Post appears twice in AV tests	Akira Matsuda	2017-02-02	1	-3/+3
* \|	DRY fake models for testing	Akira Matsuda	2017-02-02	2	-37/+7
* \|	bin/test for Active Job and Action Cable tests	Akira Matsuda	2017-02-02	2	-0/+8
\|/
*	Virtual/generated column support for MySQL 5.7.5+ and MariaDB 5.2.0+	Ryuta Kamizono	2017-02-01	13	-28/+170
*	explicitly require `listen` in `EventedFileUpdateCheckerTest` (#27867)	Arthur Nogueira Neves	2017-02-01	1	-0/+1
\|\
\| *	explicitly require `listen` in `EventedFileUpdateCheckerTest`	yuuji.yaginuma	2017-02-01	1	-0/+1
* \|	Merge pull request #27869 from y-yagi/call_gem_before_require_erubis	Matthew Draper	2017-02-01	1	-0/+1
\|\ \
\| * \|	call `gem` `erubis` before require	yuuji.yaginuma	2017-02-01	1	-0/+1
\|/ /
* \|	Merge pull request #27866 from y-yagi/remove_unused_variable	Rafael França	2017-01-31	1	-1/+1
\|\ \
\| * \|	remove unused variable	yuuji.yaginuma	2017-02-01	1	-1/+1
\| \|/
* \|	Merge pull request #27795 from meagar/fix-missing-partial-iteration	Rafael França	2017-01-31	4	-1/+12
\|\ \ \| \|/ \|/\|
\| *	Merge branch 'master' into fix-missing-partial-iteration	Matthew Eagar	2017-01-26	6	-7/+10
\| \|\
\| * \	Merge branch 'master' into fix-missing-partial-iteration	Matthew Eagar	2017-01-25	22	-105/+221
\| \|\ \
\| * \| \|	Add partial iteration variable to template keys	Matthew Eagar	2017-01-25	4	-1/+12
* \| \| \|	Merge pull request #27836 from kamipo/has_many_through_with_scope_should_resp...	Rafael França	2017-01-31	6	-5/+41
\|\ \ \ \
\| * \| \| \|	Chain scope constraints should respect own table alias	Ryuta Kamizono	2017-02-01	6	-5/+41
* \| \| \| \|	correctly set test adapter when configure the queue adapter on a per job (#26...	Yuji Yaginuma	2017-01-31	5	-10/+62
\|/ / / /
* \| \| \|	Merge pull request #27859 from yahonda/diag27826	Rafael França	2017-01-31	2	-11/+25
\|\ \ \ \
\| * \| \| \|	Add sqlite3_mem adapter to Travis CI	Yasuo Honda	2017-01-31	1	-0/+3
\| * \| \| \|	Use temporary connection pool for sqlite3_mem adapter	Yasuo Honda	2017-01-31	1	-11/+22
* \| \| \| \|	Remove deprecated callbacks from ActionDispatch middlewares	Rafael Mendonça França	2017-01-31	7	-163/+70
* \| \| \| \|	Merge pull request #27850 from apauly/feature/active_job_test_helper	Rafael França	2017-01-31	3	-7/+18
\|\ \ \ \ \
\| * \| \| \| \|	Append skipped jobs to enqueued_jobs	Alexander Pauly	2017-01-31	3	-7/+18
* \| \| \| \| \|	Merge pull request #27858 from mtsmfm/fix-inherit-from-deprecated-erubis	Rafael França	2017-01-31	3	-1/+12
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix inherit from deprecated `ActionView::Template::Handlers::Erubis`	Fumiaki MATSUSHIMA	2017-02-01	3	-1/+12
* \| \| \| \| \| \|	Merge pull request #27758 from kenta-s/neglected-todo-in-render_test	Arthur Nogueira Neves	2017-01-31	1	-2/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Get neglected TODO done in render_test	kenta-s	2017-01-24	1	-2/+1
* \| \| \| \| \| \| \|	Merge pull request #27767 from benoittgt/freeze_sql_type_with_get_oid_type	Arthur Nogueira Neves	2017-01-31	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Freeze default empty string for sql_type in get_oid_type	Benoit Tigeot	2017-01-22	1	-1/+1
* \| \| \| \| \| \| \| \|	Merge pull request #27855 from kevinzwhuang/finder-methods-typo-fix	Eileen M. Uchitelle	2017-01-31	1	-2/+2
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fix grammar typo about sort in finder_methods.rb	Kevin Huang	2017-01-30	1	-2/+2
* \| \| \| \| \| \| \| \| \|	Merge pull request #27857 from kenta-s/add-test-for-variable_size_secure_compare	Eileen M. Uchitelle	2017-01-31	1	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add test for `variable_size_secure_compare`	kenta-s	2017-01-31	1	-1/+6
* \| \| \| \| \| \| \| \| \|	Merge pull request #27856 from kenta-s/remove-redundant-right-parentheses	प्रथमेश Sonpatki	2017-01-31	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove redundant right parentheses in number_helper [ci skip]	kenta-s	2017-01-31	1	-1/+1
\|/ / / / / / / / /