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

	Commit message (Expand)	Author	Age	Files	Lines
*	Mock fork twice	Rafael Mendonça França	2016-03-01	1	-1/+1
*	Support `:any` variants lookup in `PathResolver`	Godfrey Chan	2016-03-01	2	-6/+21
*	Merge pull request #23966 from jeremy/activejob/pare-down-async-adapter-for-l...	Jeremy Daer	2016-03-01	8	-133/+110
\|\
\| *	Active Job: smaller footprint for the dev/test async adapter	Jeremy Daer	2016-02-29	8	-133/+110
* \|	Merge pull request #23973 from mohitnatoo/dummy-template-with-rails-command	Rafael França	2016-02-29	1	-1/+1
\|\ \
\| * \|	- Updating the dummy app template to have rails_command instead of rake	Mohit Natoo	2016-03-01	1	-1/+1
* \| \|	Merge pull request #23968 from bouk/improve-cable-docs	Rafael França	2016-02-29	1	-6/+2
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Remove inconsistency in the Action Cable README [ci skip]	Bouke van der Bijl	2016-02-29	1	-6/+2
\| \|/
* \|	generate config/spring.rb in new applications [closes #18874]	Xavier Noria	2016-02-29	4	-0/+14
* \|	Respect through association scopes when used with polymorphic	Sean Griffin	2016-02-29	2	-1/+8
\|/
*	Merge pull request #23927 from gaurish/jruby_ci_actionpack	Rafael França	2016-02-29	1	-0/+5
\|\
\| *	Try running CI for ActionPack on JRuby	Gaurish Sharma	2016-02-27	1	-0/+5
* \|	Merge pull request #23948 from ctm/remove_pathological_regexp	Rafael França	2016-02-29	1	-1/+1
\|\ \
\| * \|	Removes potentially quadratic Regexp from ActiveRecord::LogSubscriber#sql_color	Clifford T. Matthews	2016-02-23	1	-1/+1
* \| \|	Merge pull request #18766 from yasyf/issue_17864	Sean Griffin	2016-02-29	4	-8/+68
\|\ \ \
\| * \| \|	Honour the order of the joining model in a `has_many :through`	Yasyf Mohamedali	2015-03-02	5	-9/+69
* \| \| \|	Merge pull request #23963 from gsamokovarov/exception-wrapper-no-ac-require	Kasper Timm Hansen	2016-02-29	1	-1/+0
\|\ \ \ \
\| * \| \| \|	Drop Action Controller require in ActionDispatch::ExceptionWrapper	Genadi Samokovarov	2016-02-29	1	-1/+0
* \| \| \| \|	Merge pull request #23955 from bdewater/doc-13897	Sean Griffin	2016-02-29	1	-3/+9
\|\ \ \ \ \
\| * \| \| \| \|	Add documentation for #13897 [skip ci]	Bart de Water	2016-02-29	1	-3/+9
* \| \| \| \| \|	Merge pull request #23957 from delftswa2016/fix-documentation-stylesheet	Arthur Nogueira Neves	2016-02-29	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix value of CSS background-color property in Rails guide	Bas van IJzendoorn	2016-02-29	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #23962 from mohitnatoo/rails_command_test_semantics	Rafael França	2016-02-29	1	-9/+9
\|\ \ \ \ \
\| * \| \| \| \|	- Made changes to have test cases in actions_test more readable.	Mohit Natoo	2016-02-29	1	-6/+6
\| * \| \| \| \|	- Made changes to have test cases in actions_test more readable.	Mohit Natoo	2016-02-29	1	-5/+5
\| \|/ / / /
* \| \| \| \|	Merge pull request #23956 from delftswa2016/fix-documentation	प्रथमेश Sonpatki	2016-02-29	1	-5/+5
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix typos in Action View Overview guide	Bas van IJzendoorn	2016-02-29	1	-5/+5
\|/ / / /
* \| \| \|	Merge pull request #23951 from teoljungberg/warning-free	Kasper Timm Hansen	2016-02-29	2	-9/+9
\|\ \ \ \
\| * \| \| \|	Address ruby warnings	Teo Ljungberg	2016-02-29	2	-9/+9
\|/ / / /
* \| \| \|	Merge pull request #22591 from gregmolnar/ssl	Kasper Timm Hansen	2016-02-28	2	-2/+13
\|\ \ \ \
\| * \| \| \|	add `constraint_to` option to SSL middleware	Greg Molnar	2016-02-28	2	-2/+13
* \| \| \| \|	Merge pull request #23929 from prathamesh-sonpatki/update-deprecation-message...	Kasper Timm Hansen	2016-02-28	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Update deprecation message shown when tasks from rails namespace are run	Prathamesh Sonpatki	2016-02-27	1	-2/+2
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #23946 from prathamesh-sonpatki/fix-ac-guide	प्रथमेश Sonpatki	2016-02-28	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fix formatting in Action Cable guide [ci skip]	Prathamesh Sonpatki	2016-02-28	1	-0/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #23945 from prathamesh-sonpatki/rm-merge-conflict	David Heinemeier Hansson	2016-02-28	1	-5/+2
\|\ \ \ \ \
\| * \| \| \| \|	Fix merge conflict in Action Cable guide [ci skip]	Prathamesh Sonpatki	2016-02-28	1	-5/+2
\|/ / / / /
* \| \| \| \|	Further cleanup of the cable guide	David Heinemeier Hansson	2016-02-28	1	-100/+51
* \| \| \| \|	Merge pull request #23943 from y-yagi/remove_rake_word	प्रथमेश Sonpatki	2016-02-28	2	-4/+4
\|\ \ \ \ \
\| * \| \| \| \|	remove "rake" word [ci skip]	yuuji.yaginuma	2016-02-28	2	-4/+4
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #23944 from prathamesh-sonpatki/ac-guide-fixes	प्रथमेश Sonpatki	2016-02-28	1	-25/+25
\|\ \ \ \ \
\| * \| \| \| \|	Fix typos in Action Cable guide [ci skip]	Prathamesh Sonpatki	2016-02-28	1	-25/+25
\|/ / / / /
* \| \| \| \|	Merge pull request #23176 from davidkuhta/patch-1	David Heinemeier Hansson	2016-02-28	1	-0/+671
\|\ \ \ \ \
\| * \| \| \| \|	Header Typo	David Kuhta	2016-02-23	1	-1/+1
\| * \| \| \| \|	`stream_for` example	David Kuhta	2016-02-23	1	-0/+15
\| * \| \| \| \|	Explicitly denote that channel.rb is a default file.	David Kuhta	2016-02-23	1	-2/+2
\| * \| \| \| \|	Change ActionCable.server.broadcast to XChannel.broadcast_to	David Kuhta	2016-02-23	1	-10/+7
\| * \| \| \| \|	Create action_cable_overview.md resolves #23176 [ci skip]	David Kuhta	2016-02-14	1	-0/+659
* \| \| \| \| \|	Merge pull request #23811 from iamvery/string-channel	David Heinemeier Hansson	2016-02-28	5	-1/+37
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Update changelog	Jay Hayes	2016-02-24	1	-0/+4