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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \| \| \| \| \| \| \| \|	default value is never used, so make it required	Aaron Patterson	2014-05-23	1	-1/+1
* \| \| \| \| \| \| \| \|	push options decomposition up so we can extract	Aaron Patterson	2014-05-23	1	-20/+13
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #15289 from zzak/future_port_c8ddb61	Godfrey Chan	2014-05-23	3	-14/+14
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Future port c8ddb61	Zachary Scott	2014-05-23	3	-14/+14
* \| \| \| \| \| \| \| \|	glob_param is never used, so rm	Aaron Patterson	2014-05-23	3	-10/+8
* \| \| \| \| \| \| \| \|	Merge pull request #15285 from sergey-alekseev/remove-active-record-where-dup...	Rafael Mendonça França	2014-05-23	2	-9/+5
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove duplicated parameter check on #where!	Sergey Alekseev	2014-05-23	2	-9/+5
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #15283 from oismail91/improve_doc_for_select_tag	Rafael Mendonça França	2014-05-23	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	update docs to include html id for select_tag	Omar Ismail	2014-05-23	1	-2/+2
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #15277 from sgrif/sg-schema-cache-refactor	Rafael Mendonça França	2014-05-23	1	-31/+11
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Simplify the code in schema cache	Sean Griffin	2014-05-23	1	-31/+11
* \| \| \| \| \| \|	Merge pull request #15261 from hbin/missing_parameters	Rafael Mendonça França	2014-05-23	1	-1/+5
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Bring the missing parameters back.	Bin Huang	2014-05-23	1	-1/+5
* \| \| \| \| \| \| \|	use Proc.new to automatically do parameter checking for us	Aaron Patterson	2014-05-23	1	-3/+1
* \| \| \| \| \| \| \|	Merge pull request #15282 from sgrif/sg-remove-column-primary	Rafael Mendonça França	2014-05-23	7	-52/+10
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove `Column#primary`	Sean Griffin	2014-05-23	7	-52/+10
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #15276 from kuldeepaggarwal/fix-array-to	Rafael Mendonça França	2014-05-23	2	-1/+5
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	revert 96525d63	Kuldeep Aggarwal	2014-05-23	2	-1/+5
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #15265 from danielmbarlow/master	Rafael Mendonça França	2014-05-23	1	-2/+3
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Added force_reload to Auto-generated methods doc	danielmbarlow	2014-05-23	1	-2/+3
* \| \| \| \| \| \| \| \|	Merge pull request #15280 from sgrif/sg-postgres-defaults	Rafael Mendonça França	2014-05-23	3	-76/+78
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Move parsing of PG sql strings for defaults out of column	Sean Griffin	2014-05-23	3	-76/+78
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|