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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \|	rm reset_parameters because we automatically do it from 9ca4839a	Aaron Patterson	2014-05-27	3	-9/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	move path_parameter encoding check to the request object	Aaron Patterson	2014-05-27	3	-18/+13
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	dispatcher doesn't need `call` anymore	Aaron Patterson	2014-05-27	1	-4/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	call `serve` with the request on dispatchers	Aaron Patterson	2014-05-27	1	-9/+10
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	constraints class does not need the request class anymore	Aaron Patterson	2014-05-27	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	give all endpoints a superclass	Aaron Patterson	2014-05-27	4	-22/+40
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	skip the build business if the stack is empty	Aaron Patterson	2014-05-26	1	-2/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	stop hardcoding path_parameters and get it from the request	Aaron Patterson	2014-05-26	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	we do not need to cache rack_app	Aaron Patterson	2014-05-26	1	-9/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	a redirect is not a dispatcher by definition, so eliminate test	Aaron Patterson	2014-05-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	push is_a check up to where the Constraints object is allocated	Aaron Patterson	2014-05-26	2	-6/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	pass the request object to the application	Aaron Patterson	2014-05-25	3	-6/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	pass a request to `matches?` so we can avoid creating excess requests	Aaron Patterson	2014-05-25	2	-7/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	nothing is passed to `rack_app` anymore, so rm the params	Aaron Patterson	2014-05-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	one fewer is_a check	Aaron Patterson	2014-05-25	1	-4/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Constraints#app should never return another Constraints object, so switch to ↵	Aaron Patterson	2014-05-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	if statement
\| * \| \| \| \| \| \| \| \|	eliminate dispatcher is_a checks	Aaron Patterson	2014-05-24	1	-8/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	push is_a?(Dispatcher) check in to one place	Aaron Patterson	2014-05-24	4	-14/+12
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Always construct route objects with Constraint objects	Aaron Patterson	2014-05-24	4	-9/+10
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #15372 from akshay-vishnoi/test-cases	Rafael Mendonça França	2014-05-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test Case - Change method name
\| * \| \| \| \| \| \| \| \| \|	Test Case - Change method name	Akshay Vishnoi	2014-05-28	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #15371 from sgrif/sg-silence-deprecation-warning	Rafael Mendonça França	2014-05-27	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Silence deprecation warning in test
\| * \| \| \| \| \| \| \| \| \|	Silence deprecation warning in test	Sean Griffin	2014-05-27	1	-0/+3
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Missed a case that only occured for mysql/mysql2
* \| \| \| \| \| \| \| \| \|	Merge pull request #12080 from ShayDavidson/fix_datetime_partial_dates	Matthew Draper	2014-05-28	3	-1/+31
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added partial days support to `DateTime`'s `advance` method.
\| * \| \| \| \| \| \| \| \| \|	Fixed changelog	Shay Davidson	2013-09-02	1	-4/+12
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Added partial days support to `DateTime`'s `advance` method.	Shay Davidson	2013-08-30	3	-5/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	You can now add partial days (e.g. 2.5.days) to `DateTime` with the advance method. This was acheived by mimicing the `advance` implementation in `Time`.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #15321 from ↵	Santiago Pastorino	2014-05-27	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tgxworld/only_find_routes_as_heads_for_head_request Call get_routes_as_head only on HEAD requests.
\| * \| \| \| \| \| \| \| \| \| \|	Call get_routes_as_head only on HEAD requests.	Guo Xiang Tan	2014-05-25	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Require active_support at the railties	Rafael Mendonça França	2014-05-27	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Railties need to be used without having to require any dependecy first.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #14834 from al2o3cr/issue14155	Aaron Patterson	2014-05-27	3	-2/+31
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Correctly alias table names when joining more than once
\| * \| \| \| \| \| \| \| \| \| \|	WIP: pass existing joins to construct_join_dependency	Matt Jones	2014-05-16	3	-2/+31
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15295 from sgrif/sg-deprecate-decimals	Rafael Mendonça França	2014-05-27	7	-2/+29
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deprecate decimal columns being automatically treated as integers
\| * \| \| \| \| \| \| \| \| \| \| \|	Deprecate decimal columns being automatically treated as integers	Sean Griffin	2014-05-27	7	-2/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With ActiveRecord::Properties, we now have a reasonable path for users to continue to keep this behavior if they want it. This is an edge case that has added a lot of complexity to the code base.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15358 from arthurnn/redefine_habtm_fix	Rafael Mendonça França	2014-05-27	3	-25/+46
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix redefine a has_and_belongs_to_many inside inherited class
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix redefine a has_and_belongs_to_many inside inherited class	Arthur Neves	2014-05-27	3	-25/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After ad7b5efb55bcc2e0ccd3e7f22a81e984df8676d1, which changed how has_an_belongs_to_many used to work, we start raising an error when redefining the same has_an_belongs_to_many association. This commits fix that regression. [Fixes #14983]
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15359 from kuldeepaggarwal/f-remove-unwanted_to_sym	Yves Senn	2014-05-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove unwanted `to_sym` call.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	remove unwanted `to_sym` call.	Kuldeep Aggarwal	2014-05-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15327 from alexbel/replace_double_quotes_with_single_quotes	Yves Senn	2014-05-27	3	-11/+32
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace double quotes with single quotes while adding an entry into Gemfile
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace double quotes with single quotes while adding an entry into Gemfile	alexbel	2014-05-26	3	-11/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15356 from deeeki/activesupport_loading	Yves Senn	2014-05-27	3	-4/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `require 'active_support'` from individual modules
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `require 'active_support'` from individual modules	deeeki	2014-05-27	3	-4/+0
\|/ / / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let users require `active_support` before loading any ActiveSupport modules http://guides.rubyonrails.org/active_support_core_extensions.html
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix syntax error from 5eae77c	Zachary Scott	2014-05-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move test to the proper file	Rafael Mendonça França	2014-05-26	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All preload tests are in the eager_test file
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add test case for b13d260	Rafael Mendonça França	2014-05-26	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15301 from zzak/issue_15212	Rafael Mendonça França	2014-05-26	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip if the association was already loaded.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip if the association was already loaded.	Zachary Scott	2014-05-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15353 from sgrif/sg-mysql-condition	Rafael Mendonça França	2014-05-26	1	-2/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary branch from quoting in Mysql
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary branch from quoting in Mysql	Sean Griffin	2014-05-26	1	-2/+0
\| \| \|/ / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is already the behavior for `BigDecimal` in the abstract adapter.
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Typo in AR CHANGELOG [ci skip]	Zachary Scott	2014-05-26	1	-1/+1
\| \|_\|_\|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #15284 from sgrif/sg-properties	Rafael Mendonça França	2014-05-26	17	-22/+194
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a public API to allow users to specify column types