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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\ \ \
\| * \| \|	documentation fix	Gaurav Sharma	2014-05-24	1	-2/+2
\|/ / /
* \| \|	Merge pull request #15298 from ShunsukeAida/fix_capitalization	Rafael Mendonça França	2014-05-24	1	-1/+1
\|\ \ \
\| * \| \|	fixed capitalization	ShunsukeAida	2014-05-25	1	-1/+1
* \| \| \|	Add FIXME note about the thor bug	Rafael Mendonça França	2014-05-24	1	-0/+2
* \| \| \|	Merge pull request #9083 from bronson/patch-1	Rafael Mendonça França	2014-05-24	1	-1/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	avoid using alias in generators	Scott Bronson	2013-01-25	1	-1/+4
* \| \| \|	Merge pull request #13988 from zzak/guides_configuring_reverse_proxy	Zachary Scott	2014-05-24	1	-4/+38
\|\ \ \ \
\| * \| \| \|	Add documentation for using Rails with a reverse proxy	Zachary Scott	2014-05-24	1	-4/+38
* \| \| \| \|	Merge pull request #14986 from dlangevin/trailing-slash-url-generation	Rafael Mendonça França	2014-05-24	3	-7/+37
\|\ \ \ \ \
\| * \| \| \| \|	Fixes URL generation with trailing_slash: true	Dan Langevin	2014-05-22	3	-9/+40
* \| \| \| \| \|	pg, remove duplicated code.	Yves Senn	2014-05-24	1	-4/+0
* \| \| \| \| \|	pg, extract schema definitions into separate file.	Yves Senn	2014-05-24	2	-135/+141
* \| \| \| \| \|	Revert "Merge pull request #15293 from schneems/schneems/generator-output-in-...	Yves Senn	2014-05-24	1	-16/+12
* \| \| \| \| \|	Merge pull request #15293 from schneems/schneems/generator-output-in-error	Richard Schneeman	2014-05-24	1	-12/+16
\|\ \ \ \ \ \
\| * \| \| \| \| \|	print generators on failed generate	schneems	2014-05-24	1	-12/+16
* \| \| \| \| \| \|	Merge pull request #15278 from akshay-vishnoi/doc_changes	Andrew White	2014-05-24	1	-4/+5
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] Improve doc for ModuleConstMissing.guess_for_anonymous	Akshay Vishnoi	2014-05-24	1	-4/+5
* \| \| \| \| \| \| \|	Merge pull request #15290 from sgrif/sg-consolidate-zero-scale-decimal	Rafael Mendonça França	2014-05-23	6	-41/+42
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove special case in schema dumper for decimal without scale	Sean Griffin	2014-05-23	6	-41/+42
* \| \| \| \| \| \| \| \|	Merge pull request #15291 from francocatena/router-visualizer-fix	Rafael Mendonça França	2014-05-23	1	-2/+2
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fix router visualizer CSS and JS resources	Franco Catena	2014-05-23	1	-2/+2
* \| \| \| \| \| \| \| \| \|	Constraints contructor should always return a Constraints object	Aaron Patterson	2014-05-23	1	-9/+5