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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #27831 from y-yagi/make_backburner_integration_test_to_work	Andrew White	2017-01-28	1	-2/+2
\|\
\| *	make backburner integration test to work	yuuji.yaginuma	2017-01-28	1	-2/+2
* \|	Offer the option to use parameterization for shared processing of headers and...	David Heinemeier Hansson	2017-01-28	6	-7/+212
\|/
*	Merge pull request #27815 from y-yagi/ruby2_4_0_with_aj_integration	Jeremy Daer	2017-01-27	1	-0/+6
\|\
\| *	add combination of Ruby 2.4 + aj:integration to CI	yuuji.yaginuma	2017-01-28	1	-0/+6
* \|	Merge pull request #27820 from metaskills/mater-sqlserveryml	Eileen M. Uchitelle	2017-01-27	1	-21/+4
\|\ \ \| \|/ \|/\|
\| *	Modernize SQL Server database YAML for Linux/vNext.	Ken Collins	2017-01-27	1	-21/+4
* \|	Merge pull request #27823 from kenta-s/fix-broken-example-for-file_update_che...	Eileen M. Uchitelle	2017-01-27	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Fix broken sample code for EventedFileUpdateChecker [ci skip]	kenta-s	2017-01-28	1	-1/+1
\|/
*	Merge pull request #27814 from marutosi/rails-html-sanitizer-1.0.3	Akira Matsuda	2017-01-27	1	-1/+1
\|\
\| *	use rails-html-sanitizer >= 1.0.3	Toshi MARUYAMA	2017-01-27	1	-1/+1
* \|	Missing require "active_support/multibyte/chars"	Akira Matsuda	2017-01-27	1	-0/+1
* \|	Always use the newest rubygems when CIing	Akira Matsuda	2017-01-27	1	-0/+1
\|/
*	Merge pull request #27810 from etdsoft/bug-report-template-gem-versions-master	Eileen M. Uchitelle	2017-01-26	5	-5/+5
\|\
\| *	Bump bug report template versions to 5.0.1	Daniel Martin	2017-01-26	5	-5/+5
\|/
*	Merge pull request #27805 from y-yagi/fix_ruby_warning	Yves Senn	2017-01-26	1	-1/+1
\|\
\| *	remove warning from `bin/setup` test	yuuji.yaginuma	2017-01-26	1	-1/+1
* \|	Uninterned Symbol can be duped since ruby 2.4.1	Akira Matsuda	2017-01-26	1	-1/+4
\|/
*	Merge pull request #27804 from scottgonzalez/action-mailer-guide	Arthur Nogueira Neves	2017-01-25	1	-2/+2
\|\
\| *	Action Mailer Basics clean up [ci skip]	Scott González	2017-01-25	1	-2/+2
\|/
*	s/an/a/	Akira Matsuda	2017-01-26	3	-3/+3
*	Merge pull request #27799 from kenta-s/fix-grammar-in-number_helper	Vipul A M	2017-01-25	2	-2/+2
\|\
\| *	Fix grammar 'an hyphen' -> 'a hyphen' [ci skip]	kenta-s	2017-01-25	2	-2/+2
\|/
*	Add assertion messages	Akira Matsuda	2017-01-25	2	-2/+2
*	Merge pull request #27796 from yui-knk/keep_separator_was	Andrew White	2017-01-25	1	-1/+2
\|\
\| *	Keep the value of `$,` and restore it	yui-knk	2017-01-25	1	-1/+2
* \|	This seems to be working on JRuby 9K	Akira Matsuda	2017-01-25	1	-10/+0
* \|	Merge pull request #27798 from yui-knk/give_message_to_test_duplicable	Richard Schneeman	2017-01-25	1	-1/+1
\|\ \
\| * \|	Give a message to `#test_duplicable` assertion	yui-knk	2017-01-25	1	-1/+1
\| \|/
* \|	Change ActionView ERB Handler from Erubis to Erubi	Jeremy Evans	2017-01-25	13	-81/+214
* \|	Merge pull request #27772 from y-yagi/remove_unreachable_code	Santiago Pastorino	2017-01-24	2	-8/+0
\|\ \ \| \|/ \|/\|
\| *	remove unreachable code	yuuji.yaginuma	2017-01-23	2	-8/+0
* \|	Merge pull request #27791 from kenta-s/fix-sample-code-for-expand_cache_key-u...	Kasper Timm Hansen	2017-01-24	1	-2/+2
\|\ \
\| * \|	Fix sample code for `expand_cache_key` usage [ci skip]	kenta-s	2017-01-24	1	-2/+2
\|/ /
* \|	Merge pull request #27775 from domcleal/27774-format-reset	Eileen M. Uchitelle	2017-01-23	2	-0/+15
\|\ \
\| * \|	Delete PATH_INFO after each controller test request	Dominic Cleal	2017-01-23	2	-0/+15
\|/ /
* \|	Bundler 1.14 compat	Matthew Draper	2017-01-23	1	-1/+4
* \|	Merge pull request #27771 from y-yagi/do_not_run_git_init_when_specify_the_pr...	Santiago Pastorino	2017-01-23	2	-1/+2
\|\ \
\| * \|	do not run `git init` when specify the `pretend` option	yuuji.yaginuma	2017-01-23	2	-1/+2
\|/ /
* \|	Merge two tests that needs to initialize Rails before accessing `Rails`	Akira Matsuda	2017-01-23	1	-16/+1
* \|	Merge pull request #27766 from kenta-s/add-module-name-to-backtrace-cleaner-s...	Jon Moss	2017-01-22	1	-1/+1
\|\ \
\| * \|	Add module name to BacktraceCleaner usage example [ci skip]	kenta-s	2017-01-22	1	-1/+1
\| \|/
* \|	Merge pull request #27768 from kirs/am-decimal-cast	Guillermo Iguaran	2017-01-22	1	-1/+2
\|\ \
\| * \|	Make BigDecimal casting consistent on different platforms	Kir Shatrov	2017-01-22	1	-1/+2
\|/ /
* \|	Merge pull request #27763 from y-yagi/move_db_migrate_path_to_migration_module	Eileen M. Uchitelle	2017-01-22	3	-16/+8
\|\ \
\| * \|	move `db_migrate_path` method to `Migration` module	yuuji.yaginuma	2017-01-22	3	-16/+8
\| \|/
* \|	Merge pull request #27764 from matrix9180/add_changelog_entry_for_27425	Eileen M. Uchitelle	2017-01-22	1	-0/+6
\|\ \ \| \|/ \|/\|
\| *	Add changelog entry for #27425 [ci skip]	Chad Ingram	2017-01-21	1	-0/+6
\|/
*	Merge pull request #27760 from kenta-s/remove-unnecessary-comments-in-cache_h...	Kasper Timm Hansen	2017-01-21	1	-2/+0
\|\
\| *	Remove unnecessary comments in cache_helper.rb [ci skip]	kenta-s	2017-01-21	1	-2/+0