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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #22703 from joshsoftware/rake-log-clear	Kasper Timm Hansen	2016-01-09	3	-9/+32
\|\
\| *	rake log:clear task updated refs[#22544]	Pramod	2016-01-09	3	-9/+32
* \|	[ci skip] Clarify some Minitest origins.	Kasper Timm Hansen	2016-01-09	1	-0/+2
* \|	Extract line filtering to Railties.	Kasper Timm Hansen	2016-01-09	2	-0/+69
\|/
*	Merge pull request #22967 from schneems/schneems/generic-metadata	Sean Griffin	2016-01-08	4	-7/+27
\|\
\| *	Fixing tests and re-locating error checking.	schneems	2016-01-08	2	-3/+3
\| *	Prevent destructive action on production database	schneems	2016-01-07	4	-7/+27
* \|	Default new apps to tag logs with `request_id`	schneems	2016-01-06	2	-1/+19
* \|	Merge pull request #22933 from schneems/schneems/fix-broadcast	Richard Schneeman	2016-01-06	1	-2/+4
\|\ \
\| * \|	[close #22917] Don't output to `STDOUT` twice	schneems	2016-01-06	1	-2/+4
* \| \|	Merge pull request #22939 from y-yagi/make_generated_controller_test_file_wor...	Rafael França	2016-01-06	3	-1/+14
\|\ \ \
\| * \| \|	make generated controller test work correctly	yuuji.yaginuma	2016-01-06	3	-1/+14
\| \|/ /
* \| \|	Merge pull request #22275 from mastahyeti/per-form-csrf	Rafael França	2016-01-06	2	-1/+5
\|\ \ \
\| * \| \|	add option for per-form CSRF tokens	Ben Toews	2016-01-04	2	-1/+5
* \| \| \|	Provide a better error message if a user mistypes the name of script with runner	Stephen Blackstone	2016-01-05	2	-1/+17
\| \|/ / \|/\| \|
* \| \|	:scissors: Unnecessary spacing in the generated code	Akira Matsuda	2016-01-05	1	-1/+1
\|/ /
* \|	correctly presence check of `application_record.rb` in plugin	yuuji.yaginuma	2016-01-02	1	-0/+9
* \|	add test of that `application_record.rb` is generated in plugin	yuuji.yaginuma	2016-01-02	1	-3/+7
* \|	Merge pull request #22874 from prathamesh-sonpatki/create-application-model-u...	Rafael França	2016-01-01	2	-0/+0
\|\ \
\| * \|	Create application_record under namespaced directory in plugin	Prathamesh Sonpatki	2016-01-01	2	-0/+0
* \| \|	Remove a wasted space	Shota Iguchi	2016-01-01	1	-1/+1
* \| \|	Update copyright notices to 2016 [ci skip]	Rashmi Yadav	2015-12-31	1	-2/+2
\|/ /
* \|	Merge pull request #22826 from timrogers/actiondispatch-ssl-config	Rafael França	2015-12-31	2	-2/+9
\|\ \
\| * \|	Flexible configuration for ActionDispatch::SSL	Tim Rogers	2015-12-29	2	-2/+9
* \| \|	[ci skip] Space out framework names in USAGE	Kasper Timm Hansen	2015-12-30	2	-5/+5
* \| \|	Add sass-rails back to the default Gemfile	Rafael Mendonça França	2015-12-30	2	-0/+9
\|/ /
* \|	Changed default value of `:rc` option to `nil`	Prathamesh Sonpatki	2015-12-25	1	-1/+1
* \|	:scissors: whitespace in generated config files [skip ci]	Jon Atack	2015-12-24	2	-2/+2
* \|	Merge pull request #22750 from nettofarah/patch-1	Sean Griffin	2015-12-23	1	-1/+26
\|\ \
\| * \|	Plugin Usage and Installation instructions	Netto Farah	2015-12-23	1	-1/+26
* \| \|	Move test coloring closer to where it's used.	Kasper Timm Hansen	2015-12-23	1	-15/+9
* \| \|	Remove local variable color.	Kasper Timm Hansen	2015-12-23	1	-5/+5
* \| \|	Rename color to color_output.	Kasper Timm Hansen	2015-12-23	1	-6/+5
* \| \|	Remove unused blue color.	Kasper Timm Hansen	2015-12-23	1	-2/+1
* \| \|	Color failure line by result code.	Kasper Timm Hansen	2015-12-23	1	-1/+1
* \| \|	Rewrite aggregated results suppression.	Kasper Timm Hansen	2015-12-23	1	-10/+4
* \| \|	[ci skip] Clarify why we're clearing reporters.	Kasper Timm Hansen	2015-12-23	1	-1/+1
* \| \|	Merge pull request #22756 from lucasmazza/lm-test-reporter-colored-output	Kasper Timm Hansen	2015-12-23	3	-4/+82
\|\ \ \
\| * \| \|	Add colored output to the new test reporter.	Lucas Mazza	2015-12-22	3	-4/+82
* \| \| \|	Merge pull request #22757 from paulkogel/patch-1	Rafael França	2015-12-22	1	-1/+1
\|\ \ \ \
\| * \| \| \|	seeds.rb.tt: fix English.	Paul Kögel	2015-12-22	1	-1/+1
* \| \| \| \|	Merge pull request #22755 from y-yagi/remove_cors_initializer_from_rails_app	Sean Griffin	2015-12-22	2	-0/+12
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	remove cors initializer from rails app	yuuji.yaginuma	2015-12-22	2	-0/+12
* \| \| \| \|	release notes, extract notable changes from Railties CHANGELOG.	Yves Senn	2015-12-22	1	-4/+4
\|/ / / /
* \| \| \|	Merge pull request #22753 from gwincr11/keeps-options-breaks-assets	Matthew Draper	2015-12-22	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	Fix .keep file issue with ActionCable	Cory Gwin	2015-12-21	1	-1/+1
* \| \| \|	Fix Rails tutorial link	claudiob	2015-12-21	1	-1/+1
\| \|/ / \|/\| \|
* \| \|	Merge pull request #22685 from jeyb/remove_cable_files_for_skip_action_cable	Rafael França	2015-12-21	2	-0/+11
\|\ \ \
\| * \| \|	Ensure Action Cable files are removed when `skip_action_cable` is set.	Jey Balachandran	2015-12-21	2	-0/+11
* \| \| \|	Use the generators options to not generate channel assets	Rafael Mendonça França	2015-12-21	1	-6/+2