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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I know, it's crazy.
* \| \| \| \| \| \| \| \| \|	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 [ci skip]
\| * \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this also changes the constructor. We don't need to pass more options than "defaults" (whatever defaults are, ugh. probably another hash of stupid stuff).
* \| \| \| \| \| \| \| \| \|	Merge pull request #15285 from ↵	Rafael Mendonça França	2014-05-23	2	-9/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sergey-alekseev/remove-active-record-where-duplicated-condition Remove duplicated parameter check on #where!
\| * \| \| \| \| \| \| \| \|	Remove duplicated parameter check on #where!	Sergey Alekseev	2014-05-23	2	-9/+5
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It seems that #where! is not designed to be used as a chained where. See initial implementation at 8c2c60511beaad05a218e73c4918ab89fb1804f0. So, no need to check twice. We should not test #where! https://github.com/rails/rails/pull/15285#discussion_r13018316
* \| \| \| \| \| \| \| \|	Merge pull request #15283 from oismail91/improve_doc_for_select_tag	Rafael Mendonça França	2014-05-23	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	update select_tag docs for customizing id
\| * \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \|	Simplify the code in schema cache	Sean Griffin	2014-05-23	1	-31/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The use of default procs was unnessecary, made the code confusing to follow, and made marshalling needlessly complex.
* \| \| \| \| \| \| \|	Merge pull request #15261 from hbin/missing_parameters	Rafael Mendonça França	2014-05-23	1	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring the missing parameters back.
\| * \| \| \| \| \| \| \|	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`
\| * \| \| \| \| \| \| \|	Remove `Column#primary`	Sean Griffin	2014-05-23	7	-52/+10
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It appears to have been used at some point in the past, but is no longer used in any meaningful way. Whether a column is considered primary is a property of the model, not the schema/column. This also removes the need for yet another layer of caching of the model's schema, and we can leave that to the schema cache.
* \| \| \| \| \| \| \|	Merge pull request #15276 from kuldeepaggarwal/fix-array-to	Rafael Mendonça França	2014-05-23	2	-1/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Array#to now accept negative position also.
\| * \| \| \| \| \| \| \|	revert 96525d63	Kuldeep Aggarwal	2014-05-23	2	-1/+5
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`Array#to` is working for negative position
* \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Added force_reload to Auto-generated methods doc	danielmbarlow	2014-05-23	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Should make it a little easier to find the information. Also added note to look below for the definition of the generated methods.
* \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	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!
\| * \| \| \| \| \| \| \| \|	Remove AD::Journey::Formatter#verify_required_parts!	Viktar Basharymau	2014-05-23	1	-5/+0
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nobody uses this private method, maybe it is a leftover from some old refactoring. Let's delete it.
* \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	[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
\| * \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	Change typecasting unit tests to test type objects directly	Sean Griffin	2014-05-23	2	-159/+159
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's no longer type casting behavior of any kind inside of `Column` for the general case. These tests can be made clearer by testing the type objects directly.
* \| \| \| \| \| \| \| \|	use the accessors on the request object rather than touching env	Aaron Patterson	2014-05-23	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	find_routes only use the request, so stop passing env	Aaron Patterson	2014-05-23	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	remove NullRequest and just always pass a request class	Aaron Patterson	2014-05-23	2	-29/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	use the request object since we have it	Aaron Patterson	2014-05-23	3	-14/+15
\| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	stop hardcoding hash keys and use the accessors provided on the request object.
* \| \| \| \| \| \| \|	Remove warning remeving the method before redefining	Rafael Mendonça França	2014-05-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to test if the same method defined more than once only register one subscriber for it. We can safelly remove because the method body is the same and Subscriber use method_added hook for register the subscriber.