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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #23169 from y-yagi/rake_proxy_in_engine	Kasper Timm Hansen	2016-01-31	5	-39/+126
\|\
\| *	make rake proxy work in rails engines	yuuji.yaginuma	2016-01-31	5	-39/+126
* \|	Wrangle the asset build into something that sounds more general	Matthew Draper	2016-02-01	1	-0/+3
\|/
*	remove unnecessary gsub for `action_cable_meta_tag`	yuuji.yaginuma	2016-01-30	1	-1/+0
*	Merge pull request #23317 from rfmanuel/after-bundle-in-rails-plugin-template	Rafael França	2016-01-29	4	-2/+42
\|\
\| *	Implemented pull request changes.	Ryan Manuel	2016-01-29	1	-7/+5
\| *	Update doc with appropriate issue and pull request versions	Ryan Manuel	2016-01-28	1	-1/+1
\| *	Add an after_bundle callback in Rails plugin templates	Ryan Manuel	2016-01-28	4	-2/+44
* \|	Revert "Revert "Eliminate the EventMachine dependency""	Matthew Draper	2016-01-30	1	-2/+1
* \|	Merge pull request #23220 from maclover7/fix-23215	Richard Schneeman	2016-01-28	1	-6/+0
\|\ \ \| \|/ \|/\|
\| *	Remove empty lines in Rails development logger	Jon Moss	2016-01-24	1	-6/+0
* \|	Merge pull request #23237 from gsamokovarov/new-welcome-page	David Heinemeier Hansson	2016-01-28	3	-268/+65
\|\ \
\| * \|	Introduce new welcome page for new projects	Genadi Samokovarov	2016-01-26	3	-268/+65
* \| \|	Revert "Eliminate the EventMachine dependency"	David Heinemeier Hansson	2016-01-27	1	-1/+2
* \| \|	[ci skip] Don’t explicitly mention EventMachine	claudiob	2016-01-25	2	-2/+2
\|/ /
* \|	Merge branch '5-0-beta-sec'	Aaron Patterson	2016-01-25	1	-1/+1
\|\ \
\| * \|	bumping version	Aaron Patterson	2016-01-25	1	-1/+1
* \| \|	Merge pull request #23212 from vipulnsward/bin-rails	Kasper Timm Hansen	2016-01-24	9	-95/+96
\|\ \ \
\| * \| \|	Be consistent in testing outputs from railties test and use /bin/rails everyw...	Vipul A M	2016-01-24	9	-95/+96
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #23152 from matthewd/actioncable-concurrent	David Heinemeier Hansson	2016-01-24	1	-2/+1
\|\ \ \
\| * \| \|	Ditch the EM error logging helper	Matthew Draper	2016-01-24	1	-2/+1
* \| \| \|	Pare back default `index` option for the migration generator	Prathamesh Sonpatki	2016-01-24	4	-32/+13
\|/ / /
* / /	Rails::Generators::Actions#gem should work even if frozen string is passed as...	Prathamesh Sonpatki	2016-01-24	2	-1/+9
\|/ /
* \|	prevent --skip-action-cable from erroring when --api option is used	Dave Riddle	2016-01-22	2	-1/+13
* \|	remove `per_form_csrf_tokens` initializer from Rails API	yuuji.yaginuma	2016-01-22	2	-0/+2
* \|	Merge pull request #23174 from JuanitoFatas/followup-skip-action-cable	Kasper Timm Hansen	2016-01-22	2	-0/+4
\|\ \
\| * \|	Remove action_cable_meta_tag when skip action_cable	JuanitoFatas	2016-01-22	2	-0/+4
* \| \|	Add `config/cable.yml` to list of default files in Rails generator	Jon Moss	2016-01-21	1	-0/+1
\|/ /
* \|	Merge pull request #23078 from y-yagi/add_application_mailer_rb_to_mountable_...	Rafael França	2016-01-21	4	-1/+12
\|\ \
\| * \|	allow symbol to end of string in `wrap_in_modules`	yuuji.yaginuma	2016-01-16	2	-5/+5
\| * \|	add application_mailer.rb to template of mountable engine	yuuji.yaginuma	2016-01-15	3	-0/+11
* \| \|	updating secrets.yml template to use rails command instead of rake	Diego Plentz	2016-01-21	1	-1/+1
* \| \|	Merge pull request #22950 from maclover7/adapterize-storage-actioncable	Matthew Draper	2016-01-20	5	-12/+35
\|\ \ \
\| * \| \|	Add em-hiredis and redis as default Gems for new applications	Jon Moss	2016-01-18	2	-0/+20
\| * \| \|	Adapterize ActionCable storage and extract behavior	Jon Moss	2016-01-18	4	-12/+15
* \| \| \|	Remove incomplete filter runs all tests in plugins.	Kasper Timm Hansen	2016-01-18	1	-8/+0
* \| \| \|	Don't run all tests when files end in a colon.	Kasper Timm Hansen	2016-01-18	2	-9/+1
* \| \| \|	Merge pull request #23006 from Edouard-chin/code_statistic_ignore_hidde_files	Kasper Timm Hansen	2016-01-18	2	-2/+15
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	CodeStatistic will now ignore hidden files:	Edouard CHIN	2016-01-18	2	-2/+15
* \| \| \|	Avoid multiple default paths to server.pid file	Tawan Sierek	2016-01-16	2	-1/+12
* \| \| \|	remove unnecessary `ENV[]` from `log:clear` example [ci skip]	yuuji.yaginuma	2016-01-16	1	-1/+1
\| \|/ / \|/\| \|
* \| \|	Merge pull request #23014 from jonatack/improve-generated-config-files	Rafael França	2016-01-15	2	-4/+6
\|\ \ \
\| * \| \|	Improve generated config initializer files	Jon Atack	2016-01-13	2	-4/+6
* \| \| \|	bring back `TEST` env for `rake test`.	Yves Senn	2016-01-12	3	-1/+21
\|/ / /
* \| \|	Merge pull request #23003 from y-yagi/remove_warnings	Kasper Timm Hansen	2016-01-11	1	-2/+2
\|\ \ \
\| * \| \|	remove warnings from rake test	yuuji.yaginuma	2016-01-11	1	-2/+2
\| \|/ /
* \| \|	Merge pull request #22808 from y-yagi/do_not_clear_all_reporters	Kasper Timm Hansen	2016-01-11	1	-1/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	delete only unnecessary reporter	yuuji.yaginuma	2016-01-11	1	-1/+2
* \| \|	Added multiple line filters support for test runner	Siva Gollapalli	2016-01-10	3	-4/+87
* \| \|	Merge pull request #22703 from joshsoftware/rake-log-clear	Kasper Timm Hansen	2016-01-09	3	-9/+32
\|\ \ \