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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	Assert that the `:prefix` option of `number_to_human_size` is deprecated	Roque Pinel	2015-08-12	1	-8/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #21021 from sgrif/sg-no-routes-comment	Sean Griffin	2015-08-12	1	-54/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the giant comment in routes.rb with a link to the guides
\| * \| \| \| \| \| \| \| \|	Replace the giant comment in routes.rb with a link to the guides	Sean Griffin	2015-07-24	1	-54/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This comment not only serves no purpose, but in my experience is actively detrimental to new developers getting started with Rails. Expereinced developers just end up deleting this comment, and are annoyed that they had to take this step. I also spend a lot of time mentoring brand new developers, and a consistent theme I've seen is that this comment just ends up intimidating them, and making them think it's dangerous to edit this file. One of my students just said this (due to the number of comments which even new developers don't actually read, they just see it as a sign that this thing is "dangerous"). > I don't edit any file that Rails generates for me, until my instructor > says that it's OK to do so. Realistically, this comment adds 0 value. We have very good documentation, which we can just link to instead. If someone is truly new enough to benefit from this info, they presumably just ran `gem install rails`, and have an internet connection that they can use to read the routing guide. The choice of language here was very specific. I chose "the DSL available" over "what is possible", because a consistent theme I've noticed among my students is that they aren't aware that this is actually a Ruby file, and can write any Ruby code here that they want. This file is not the only offender, but is by far the biggest point of pain that I've seen, and felt it was a good spot to open this discussion.
* \| \| \| \| \| \| \| \| \|	Merge pull request #21217 from myrridin/myrridin-documentation-updates	Zachary Scott	2015-08-12	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Documentation: Switch around a common phrase for readability
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Switch around a common idiom for readability	Thomas Hart II	2015-08-05	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	remove the `add_request_method` method	Aaron Patterson	2015-08-12	1	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I didn't like this method because it mutates the parameters. Now that the method is so small, just push it up to `initialize`
* \| \| \| \| \| \| \| \| \| \|	Skip statement cache on through association reader	Rafael Mendonça França	2015-08-12	11	-21/+120
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the through class has default scopes we should skip the statement cache. Closes #20745.
* \| \| \| \| \| \| \| \| \| \|	remove side effects in `normalize_defaults`	Aaron Patterson	2015-08-12	1	-8/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	now the `@defaults` variable doesn't need to be set before calling `normalize_defaults`
* \| \| \| \| \| \| \| \| \| \|	remove unnecessary deletes	Aaron Patterson	2015-08-12	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These three options are stored in the `scope` chain outside of the options hash. If they are in the options hash, then someone passed them in to `match` and they don't really do anything. So lets remove the code.
* \| \| \| \| \| \| \| \| \| \|	pull `format` out of the options hash	Aaron Patterson	2015-08-12	1	-11/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove `format` from the options hash in the scope chain so that we don't need to remove it later
* \| \| \| \| \| \| \| \| \| \|	pull `formatted` up the stack	Aaron Patterson	2015-08-12	2	-15/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this reduces the number of times we have to mutate the options hash.
* \| \| \| \| \| \| \| \| \| \|	add a regression test for scoped `format` params	Aaron Patterson	2015-08-12	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This just ensures that `format` is applied to things inside the scope
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #21214 from rodzyn/fewer_objects_and_refactoring	Rafael Mendonça França	2015-08-12	1	-6/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Fewer objects and refactoring
\| * \| \| \| \| \| \| \| \| \|	Simplify code	Marcin Olichwirowicz	2015-08-13	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we are always responding with an array and using `any?`, we don't need to check if an array is empty
\| * \| \| \| \| \| \| \| \| \|	Avoid unnecessary MatchData objects	Marcin Olichwirowicz	2015-08-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	store `via` outside the options hash	Aaron Patterson	2015-08-12	1	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now we don't have to manually remove this from the options hash since the scope stores it outside of "options"
* \| \| \| \| \| \| \| \| \| \|	don't mutate the caller's variables	Aaron Patterson	2015-08-12	1	-14/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the `options` reader from `Resource` because nobody needs to see that hash. Also remove mutations on the options hash in `apply_common_behavior_for` because leaving the side effects in that method makes it difficult to understand what is going on in the caller.
* \| \| \| \| \| \| \| \| \| \|	store `:only` and `:except` outside the normal options hash	Aaron Patterson	2015-08-12	1	-9/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	these two keys have a different merge strategy, and they also just get removed from the options hash later in the code. If we store them in a separate place, then we don't need to remove them later
* \| \| \| \| \| \| \| \| \| \|	add a regression test for adding arbitrary keys to `scope`	Aaron Patterson	2015-08-12	1	-0/+15
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	add a method to `Scope` for getting mapping options	Aaron Patterson	2015-08-12	2	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eventually we don't want to expose the "options" hash from scope, only read values from it. Lets start by adding a reader method.
* \| \| \| \| \| \| \| \| \|	pull via checking up to via extraction	Aaron Patterson	2015-08-12	1	-11/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	now we don't need to construct a Mapping object just to get an ArgumentError if there is no `via` parameter provided.
* \| \| \| \| \| \| \| \| \|	pull `via` all the way out of `add_route`	Aaron Patterson	2015-08-12	2	-11/+20
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	fix via handling when it's in a scope	Aaron Patterson	2015-08-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	add a test for adding "via" using `scope`	Aaron Patterson	2015-08-12	1	-0/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	pull `via` extraction up	Aaron Patterson	2015-08-12	2	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're going to try pulling this up further, and check `via` validity sooner. This way we don't have to do a bunch of processing on `options` hashes only to find out that the route is incorrect
* \| \| \| \| \| \| \| \| \|	simplify `split_constraints`	Aaron Patterson	2015-08-12	1	-12/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we do the Regexp verification in a second method, then the `split_constraints` method gets much easier.
* \| \| \| \| \| \| \| \| \|	remove side effects from `normalize_format`	Aaron Patterson	2015-08-12	1	-9/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	switch === to case / when	Aaron Patterson	2015-08-12	1	-3/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	make `split_constraints` more functional.	Aaron Patterson	2015-08-12	1	-14/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I don't want `split_constraints` to mutate any instance variables. That way it's easier to move the method around and understand what it does (it has no side effects)
* \| \| \| \| \| \| \| \| \|	make `constraints` more functional	Aaron Patterson	2015-08-12	1	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I don't want to rely on mutating ivars. This gives me more freedom when refactoring
* \| \| \| \| \| \| \| \| \|	Merge pull request #21211 from brooksreese/resrc_io_website_closed	Rafael Mendonça França	2015-08-12	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Removed link to reSRC.io - site closed
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Removed link to reSRC.io - site closed	Brooks Reese	2015-08-12	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #21210 from akihiro17/fix-rdoc-markup	Rafael Mendonça França	2015-08-12	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix rdoc markup
\| * \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix rdoc markup	akihiro17	2015-08-12	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	docs, tiny rdoc markup fix. [ci skip]	Yves Senn	2015-08-12	1	-1/+2
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`+` doesn't work around content with spaces fallback `<tt>`.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #21205 from akihiro17/fix-doc	Matthew Draper	2015-08-12	1	-13/+13
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix the indentation
\| * \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix the indentation	akihiro17	2015-08-12	1	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #21204 from brooksreese/ruby_v_before_tip	Matthew Draper	2015-08-12	1	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Swap ruby -v and the installation tip
\| * \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Swap ruby -v and the installation tip	Brooks Reese	2015-08-11	1	-5/+5
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	only call `split_constraints` once	Aaron Patterson	2015-08-11	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	only do is_a? checks on `options_constraints` once	Aaron Patterson	2015-08-11	1	-16/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	we don't need to do it so many times.
* \| \| \| \| \| \| \| \| \| \| \|	Mapping instances don't need `scope` anymore	Aaron Patterson	2015-08-11	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	pull scope[:constraints] up	Aaron Patterson	2015-08-11	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now we only need to call `split_constraints` possibly twice!
* \| \| \| \| \| \| \| \| \| \| \|	pull :format up a little bit	Aaron Patterson	2015-08-11	1	-3/+5
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	apparently `format` can also come from the scope options, so we need to extract it there too.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #21203 from denniss/issue-21199	Sean Griffin	2015-08-11	2	-1/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Authorization scheme should be case insensitive. Fixes #21199
\| * \| \| \| \| \| \| \| \| \| \|	Authorization scheme should be case insensitive. Fixes #21199	Dennis Suratna	2015-08-11	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	pull `to` up	Aaron Patterson	2015-08-11	2	-19/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this way we don't have to insert / delete it from the options hash so many times.
* \| \| \| \| \| \| \| \| \| \| \|	push scope access up for modules	Aaron Patterson	2015-08-11	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	eventually we'll remove the need to access `scope` inside the Mapping object.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #21202 from rodzyn/rename_method	Rafael Mendonça França	2015-08-11	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename match_attribute_method? to matched_attribute_method
\| * \| \| \| \| \| \| \| \| \| \| \|	Rename match_attribute_method? to matched_attribute_method	Marcin Olichwirowicz	2015-08-12	1	-4/+4
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`match_attribute_method?` is a bit confusing because it suggest that a return value is a boolean which is not true.