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

	Commit message (Expand)	Author	Age	Files	Lines
*	correct docs for (asset\|image)_path [ci skip]	Aditya Kapoor	2014-05-27	1	-14/+14
*	Merge pull request #15345 from matthewd/skip-dalli-errors	Guillermo Iguaran	2014-05-26	1	-0/+18
\|\
\| *	Skip individual tests upon Dalli::RingError	Matthew Draper	2014-05-27	1	-0/+18
* \|	Merge pull request #15342 from aditya-kapoor/correct-tag-docs	Rafael Mendonça França	2014-05-26	1	-10/+10
\|\ \ \| \|/ \|/\|
\| *	correct doc for (audio\|video)_tag [ci skip]	Aditya Kapoor	2014-05-27	1	-10/+10
* \|	Escape user input before showing in the page.	Rafael Mendonça França	2014-05-26	1	-2/+2
\|/
*	Merge pull request #15333 from ShunsukeAida/update_ruby_version	Rafael Mendonça França	2014-05-26	1	-1/+1
\|\
\| *	update the recommended ruby version	ShunsukeAida	2014-05-27	1	-1/+1
* \|	Merge pull request #15294 from schneems/schneems/generator-output-in-error2	Rafael Mendonça França	2014-05-26	2	-14/+20
\|\ \
\| * \|	print generators on failed generate	schneems	2014-05-26	2	-14/+20
* \| \|	Merge pull request #15340 from aditya-kapoor/correct-docs	Rafael Mendonça França	2014-05-26	1	-15/+16
\|\ \ \
\| * \| \|	Correct Documentation for asset_tag_helpers	Aditya Kapoor	2014-05-26	1	-15/+16
* \| \| \|	Merge pull request #15339 from sgrif/sg-mysql-booleans	Rafael Mendonça França	2014-05-26	2	-13/+18
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Refactor the type casting of booleans in MySQL	Sean Griffin	2014-05-26	2	-13/+18
\|/ / /
* \| \|	Merge pull request #15336 from sgrif/sg-quoting	Matthew Draper	2014-05-27	5	-54/+33
\|\ \ \
\| * \| \|	Remove checks against `column.type` in abstract adapter quoting	Sean Griffin	2014-05-26	5	-54/+33
\| \|/ /
* \| \|	Merge pull request #15335 from sgrif/sg-missing-test-case	Rafael Mendonça França	2014-05-26	2	-0/+11
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add missing test case for quoting behavior	Sean Griffin	2014-05-26	2	-0/+11
\|/ /
* \|	Merge pull request #15307 from sgrif/sg-type-cast-for-write	Yves Senn	2014-05-26	6	-10/+19
\|\ \
\| * \|	Add an interface for type objects to control Ruby => SQL	Sean Griffin	2014-05-26	6	-10/+19
\| \|/
* \|	pg, add missing `:nodoc:` to adapter.	Yves Senn	2014-05-26	1	-8/+8
* \|	pg, remove unused code. Use `extract_schema_and_table` instead.	Yves Senn	2014-05-26	1	-10/+0
* \|	Merge pull request #15325 from tgxworld/no_need_to_call_to_s	Yves Senn	2014-05-26	2	-2/+2
\|\ \
\| * \|	Remove duplicated to_s method call.	Guo Xiang Tan	2014-05-25	2	-2/+2
* \| \|	Merge pull request #15316 from akshay-vishnoi/test-cases	Yves Senn	2014-05-26	1	-7/+8
\|\ \ \
\| * \| \|	Fix test cases for inflector.rb	Akshay Vishnoi	2014-05-25	1	-7/+8
* \| \| \|	Merge pull request #15324 from andriytyurnikov/simple_rake_stats_for_everything	Yves Senn	2014-05-26	1	-18/+22
\|\ \ \ \
\| * \| \| \|	simple solution that brings rake stats task to every kind of rails project	Andriy Tyurnikov	2014-05-26	1	-18/+22
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #15328 from kuldeepaggarwal/remove-warnings	Yves Senn	2014-05-26	1	-1/+1
\|\ \ \ \
\| * \| \| \|	remove unused variable warning	Kuldeep Aggarwal	2014-05-26	1	-1/+1
* \| \| \| \|	Fix docs for ActionController::Renderers.add	Guillermo Iguaran	2014-05-26	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #15310 from tgxworld/small_refactor_get_routes_as_head	Carlos Antonio da Silva	2014-05-25	1	-3/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Remove unnecessary flatten! method call.	Guo Xiang Tan	2014-05-25	1	-3/+1
* \| \| \|	Merge pull request #15315 from JuanitoFatas/guides-guidelines	Santiago Pastorino	2014-05-25	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	[ci skip] Update GFM link in guides guidelines.	Juanito Fatas	2014-05-25	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #15312 from JuanitoFatas/action_view/asset_path	Yves Senn	2014-05-25	1	-1/+1
\|\ \ \
\| * \| \|	Convert source to string if it is present.	Juanito Fatas	2014-05-25	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #15311 from zuhao/refactor_actionpack_bare_metal_test	Yves Senn	2014-05-25	1	-2/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	The correct status to test should be :switching_protocols.	Zuhao Wan	2014-05-25	1	-2/+2
\|/ /
* \|	Merge pull request #15305 from tgxworld/remove_unnecessary_require	Guillermo Iguaran	2014-05-24	4	-5/+2
\|\ \
\| * \|	Remove unnecessary require of Minitest.	Guo Xiang Tan	2014-05-24	4	-5/+2
* \| \|	unwrap the constraints object on initialization, eliminate loops	Aaron Patterson	2014-05-24	4	-3/+12
* \| \|	Merge pull request #15304 from JohnKellyFerguson/guides-4.1.1	Xavier Noria	2014-05-25	6	-58/+61
\|\ \ \
\| * \| \|	Update all Rails 4.1.0 references in guides to 4.1.1 [ci skip]	John Kelly Ferguson	2014-05-24	6	-58/+61
* \| \| \|	integration tests do not need to load fixtures by hand	Xavier Noria	2014-05-25	3	-11/+0
\|/ / /
* \| \|	Merge pull request #15303 from JohnKellyFerguson/guides-ar-querying	Arthur Nogueira Neves	2014-05-24	2	-16/+41
\|\ \ \
\| * \| \|	Improve readability of Explain Queries table in guides [ci skip]	John Kelly Ferguson	2014-05-24	2	-16/+41
\|/ / /
* \| \|	Merge pull request #15299 from andriytyurnikov/engine_friendly_rake_stats	Rafael Mendonça França	2014-05-24	2	-19/+24
\|\ \ \
\| * \| \|	rake stats for engines	Andriy Tyurnikov	2014-05-24	2	-19/+24
* \| \| \|	Merge pull request #15264 from Gaurav2728/gaurav-documentation_fix	Rafael Mendonça França	2014-05-24	1	-2/+2
\|\ \ \ \