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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #15275 from kuldeepaggarwal/add-test	Rafael Mendonça França	2014-05-23	2	-0/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	add test cases for negative position in Array#from	Kuldeep Aggarwal	2014-05-23	2	-0/+4
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	there is no formatter on the router object, so rm	Aaron Patterson	2014-05-23	1	-1/+0
* \| \| \| \| \|	Merge pull request #15271 from sgrif/sg-remove-duplicated-setup	Rafael Mendonça França	2014-05-23	1	-4/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove duplicated setup in test	Sean Griffin	2014-05-23	1	-4/+3
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #15273 from DNNX/formatter-refactoring-4	Rafael Mendonça França	2014-05-23	1	-5/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove AD::Journey::Formatter#verify_required_parts!	Viktar Basharymau	2014-05-23	1	-5/+0
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	decouple the router object from the request class	Aaron Patterson	2014-05-23	3	-21/+10
* \| \| \| \| \|	pass the correct custom request to the recognize method	Aaron Patterson	2014-05-23	3	-17/+12
* \| \| \| \| \|	switch to the `serve` method so we can remove the request class (eventually)	Aaron Patterson	2014-05-23	2	-8/+6
* \| \| \| \| \|	pull request allocation up one frame	Aaron Patterson	2014-05-23	1	-1/+3
* \| \| \| \| \|	extract request allocation from the main app serving routine	Aaron Patterson	2014-05-23	2	-2/+5
* \| \| \| \| \|	Merge pull request #15279 from akshay-vishnoi/remove#===	Rafael Mendonça França	2014-05-23	1	-2/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	[ci skip] Remove Duration#=== when we drop support for 2.0.0-p353	Akshay Vishnoi	2014-05-23	1	-2/+1
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #15281 from sgrif/sg-inline-point-type-cast	Rafael Mendonça França	2014-05-23	2	-8/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Inline type cast method for PG points	Sean Griffin	2014-05-23	2	-8/+4
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #15274 from sgrif/sg-move-type-tests	Rafael Mendonça França	2014-05-23	2	-159/+159
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Change typecasting unit tests to test type objects directly	Sean Griffin	2014-05-23	2	-159/+159
\| \|/ / / / /
* \| \| \| \| \|	use the accessors on the request object rather than touching env	Aaron Patterson	2014-05-23	1	-2/+2