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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #15345 from matthewd/skip-dalli-errors	Guillermo Iguaran	2014-05-26	1	-0/+18
\|\ \| \| \| \|	Skip individual tests upon Dalli::RingError
\| *	Skip individual tests upon Dalli::RingError	Matthew Draper	2014-05-27	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unlike the outer `rescue`, this one is much more precise about what we want to handle: a connection failure (`Dalli::RingError`) is not relevant to what we're testing here. But other Dalli errors may well be indicating an actual problem.
* \|	Merge pull request #15342 from aditya-kapoor/correct-tag-docs	Rafael Mendonça França	2014-05-26	1	-10/+10
\|\ \ \| \|/ \|/\|	correct docs for audio_tag and video_tag [ci skip]
\| *	correct doc for (audio\|video)_tag [ci skip]	Aditya Kapoor	2014-05-27	1	-10/+10
\| \|
* \|	Escape user input before showing in the page.	Rafael Mendonça França	2014-05-26	1	-2/+2
\|/ \| \| \| \| \|	This is not a security issue since this page is not present in production and user have to type something in the field but is better to escape the input.
*	Merge pull request #15333 from ShunsukeAida/update_ruby_version	Rafael Mendonça França	2014-05-26	1	-1/+1
\|\ \| \| \| \|	update the recommended ruby version.
\| *	update the recommended ruby version	ShunsukeAida	2014-05-27	1	-1/+1
\| \|
* \|	Merge pull request #15294 from schneems/schneems/generator-output-in-error2	Rafael Mendonça França	2014-05-26	2	-14/+20
\|\ \ \| \| \| \| \| \|	print generators on failed generate
\| * \|	print generators on failed generate	schneems	2014-05-26	2	-14/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let's say we just ran: ``` $ rails g migrate add_click_to_issue_assignment ``` We will get an error that looks like: ``` Could not find generator migrate. ``` This patch adds all existing migrations to the output to make it easier for a developer to find a valid migration. ``` Could not find generator "migrate". Please select a valid generator: Rails: assets controller generator helper integration_test mailer migration model resource scaffold scaffold_controller task ``` It would be nice to do some spelling detection and suggest alternatives, but for now this should help.
* \| \|	Merge pull request #15340 from aditya-kapoor/correct-docs	Rafael Mendonça França	2014-05-26	1	-15/+16
\|\ \ \ \| \| \| \| \| \| \| \|	Correct Documentation for asset_tag_helpers
\| * \| \|	Correct Documentation for asset_tag_helpers	Aditya Kapoor	2014-05-26	1	-15/+16
\| \| \| \|
* \| \| \|	Merge pull request #15339 from sgrif/sg-mysql-booleans	Rafael Mendonça França	2014-05-26	2	-13/+18
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Refactor the type casting of booleans in MySQL
\| * \| \|	Refactor the type casting of booleans in MySQL	Sean Griffin	2014-05-26	2	-13/+18
\|/ / /
* \| \|	Merge pull request #15336 from sgrif/sg-quoting	Matthew Draper	2014-05-27	5	-54/+33
\|\ \ \ \| \| \| \| \| \| \| \|	Remove checks against `column.type` in abstract adapter quoting
\| * \| \|	Remove checks against `column.type` in abstract adapter quoting	Sean Griffin	2014-05-26	5	-54/+33
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The intention is to eventually remove `column` from the arguments list both for `quote` and for `type_cast` entirely. This is the first step to that end.
* \| \|	Merge pull request #15335 from sgrif/sg-missing-test-case	Rafael Mendonça França	2014-05-26	2	-0/+11
\|\ \ \ \| \|/ / \|/\| \|	Add missing test case for quoting behavior
\| * \|	Add missing test case for quoting behavior	Sean Griffin	2014-05-26	2	-0/+11
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It appears that the only time that `quote` is called with a column, but without first calling `type_cast` is when where is called with an array. My previous pull request broke this behavior, without failing tests. This adds a test for the only case I can think of that exercises the `if column.type == :integer` branch of `quote` effectively.
* \|	Merge pull request #15307 from sgrif/sg-type-cast-for-write	Yves Senn	2014-05-26	6	-10/+19
\|\ \ \| \| \| \| \| \|	Add an interface for type objects to control Ruby => SQL
\| * \|	Add an interface for type objects to control Ruby => SQL	Sean Griffin	2014-05-26	6	-10/+19
\| \|/ \| \| \| \| \| \| \| \|	Adds the ability to save custom types, which type cast to non-primitive ruby objects.
* \|	pg, add missing `:nodoc:` to adapter.	Yves Senn	2014-05-26	1	-8/+8
\| \|
* \|	pg, remove unused code. Use `extract_schema_and_table` instead.	Yves Senn	2014-05-26	1	-10/+0
\| \|
* \|	Merge pull request #15325 from tgxworld/no_need_to_call_to_s	Yves Senn	2014-05-26	2	-2/+2
\|\ \ \| \| \| \| \| \|	Remove duplicated to_s method call.
\| * \|	Remove duplicated to_s method call.	Guo Xiang Tan	2014-05-25	2	-2/+2
\| \| \|
* \| \|	Merge pull request #15316 from akshay-vishnoi/test-cases	Yves Senn	2014-05-26	1	-7/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix test cases for inflector.rb
\| * \| \|	Fix test cases for inflector.rb	Akshay Vishnoi	2014-05-25	1	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`yield` was missing in #with_dup, due to which 57 assertions were not running in real, and all tests were passing by default. Error was introduced in commit - 31ceb5e.
* \| \| \|	Merge pull request #15324 from andriytyurnikov/simple_rake_stats_for_everything	Yves Senn	2014-05-26	1	-18/+22
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	simple solution that brings rake stats task to all rails project
\| * \| \| \|	simple solution that brings rake stats task to every kind of rails project	Andriy Tyurnikov	2014-05-26	1	-18/+22
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #15328 from kuldeepaggarwal/remove-warnings	Yves Senn	2014-05-26	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	remove unused variable warning.
\| * \| \| \|	remove unused variable warning	Kuldeep Aggarwal	2014-05-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`warning: assigned but unused variable - album`
* \| \| \| \|	Fix docs for ActionController::Renderers.add	Guillermo Iguaran	2014-05-26	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #15310 from tgxworld/small_refactor_get_routes_as_head	Carlos Antonio da Silva	2014-05-25	1	-3/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Remove unnecessary flatten! method call.
\| * \| \|	Remove unnecessary flatten! method call.	Guo Xiang Tan	2014-05-25	1	-3/+1
\| \| \| \|
* \| \| \|	Merge pull request #15315 from JuanitoFatas/guides-guidelines	Santiago Pastorino	2014-05-25	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	[ci skip] Update GFM link in guides guidelines.
\| * \| \|	[ci skip] Update GFM link in guides guidelines.	Juanito Fatas	2014-05-25	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	Also remove a duplicated sentence.
* \| \|	Merge pull request #15312 from JuanitoFatas/action_view/asset_path	Yves Senn	2014-05-25	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Convert source to string if it is present.
\| * \| \|	Convert source to string if it is present.	Juanito Fatas	2014-05-25	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #15311 from zuhao/refactor_actionpack_bare_metal_test	Yves Senn	2014-05-25	1	-2/+2
\|\ \ \ \| \|/ / \|/\| \|	The correct status to test should be :switching_protocols.
\| * \|	The correct status to test should be :switching_protocols.	Zuhao Wan	2014-05-25	1	-2/+2
\|/ /
* \|	Merge pull request #15305 from tgxworld/remove_unnecessary_require	Guillermo Iguaran	2014-05-24	4	-5/+2
\|\ \ \| \| \| \| \| \|	Remove unnecessary require of Minitest.
\| * \|	Remove unnecessary require of Minitest.	Guo Xiang Tan	2014-05-24	4	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Minitest has already been required when calling Minitest.autorun.
* \| \|	unwrap the constraints object on initialization, eliminate loops	Aaron Patterson	2014-05-24	4	-3/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unwrap Constraints objects. I don't actually think it's possible to pass a Constraints object to this constructor, but there were multiple places that kept testing children of this object. I think they were just being defensive, but I have no idea.
* \| \|	Merge pull request #15304 from JohnKellyFerguson/guides-4.1.1	Xavier Noria	2014-05-25	6	-58/+61
\|\ \ \ \| \| \| \| \| \| \| \|	Update all Rails 4.1.0 references in guides to 4.1.1 [ci skip]
\| * \| \|	Update all Rails 4.1.0 references in guides to 4.1.1 [ci skip]	John Kelly Ferguson	2014-05-24	6	-58/+61
\| \| \| \|
* \| \| \|	integration tests do not need to load fixtures by hand	Xavier Noria	2014-05-25	3	-11/+0
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	I don't know when this changed, checked back up to 3.2 and integration tests instantiate fixtures just fine.
* \| \|	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
\| * \| \|	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
\| * \| \|	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 link fix and removing unused reader
\| * \| \| \|	documentation fix	Gaurav Sharma	2014-05-24	1	-2/+2
\|/ / / /