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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	Merge pull request #14951 from jenrzzz/module_table_name_suffix	Carlos Antonio da Silva	2014-05-05	4	-1/+63
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Add support for module-level table_suffix in models
\| * \| \| \|	Add support for module-level table_suffix in models	Jenner LaFave	2014-05-05	4	-1/+63
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes table_name_suffix work the same as table_name_prefix when using namespaced models. Pretty much the same as 67d1cec.
* \| \| \|	Improve CHANGELOG entry [ci skip]	Rafael Mendonça França	2014-05-05	1	-3/+3
\| \| \| \|
* \| \| \|	Merge pull request #14978 from bogdan/relation-join	Rafael Mendonça França	2014-05-05	5	-2/+17
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Regression 4.0 -> 4.1] Put back Relation#join method as a delegate to Array
\| * \| \| \|	Put back Relation#join method as a delegate to Array	Bogdan Gusiev	2014-05-05	5	-2/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a regression 4.0 -> 4.1 fix. In 4.1.0 Relation#join is delegated to Arel#SelectManager. In 4.0 series it is delegated to Array#join This patch puts back the behaviour of 4.0
* \| \| \| \|	Get rid of unused method in AR Post test model	Carlos Antonio da Silva	2014-05-05	1	-4/+0
\| \| \| \| \|
* \| \| \| \|	Get rid of extra local var that does not add to the logic	Carlos Antonio da Silva	2014-05-05	1	-2/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	There are too many "action name" variables around the process method.
* \| \| \|	Arel master is 6.0.0	Rafael Mendonça França	2014-05-05	1	-1/+1
\| \| \| \|
* \| \| \|	Improve CHANGELOG entry	Rafael Mendonça França	2014-05-04	1	-2/+2
\| \| \| \|
* \| \| \|	Use assert_raises	Rafael Mendonça França	2014-05-04	1	-3/+1
\| \| \| \|
* \| \| \|	Do not use short-circuit return	Rafael Mendonça França	2014-05-04	1	-2/+3
\| \| \| \|
* \| \| \|	Merge pull request #11166 from xavier/callable_constraint_verification	Rafael Mendonça França	2014-05-04	3	-0/+29
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Callable route constraint verification Conflicts: actionpack/CHANGELOG.md
\| * \| \| \|	Verify that route constraints respond to the expected messages instead of ↵	Xavier Defrang	2013-06-28	3	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	silently failing to enforce the constraint
* \| \| \| \|	Improve CHANGELOG [ci skip]	Rafael Mendonça França	2014-05-04	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	No need the else clause	Rafael Mendonça França	2014-05-04	1	-2/+0
\| \| \| \| \|
* \| \| \| \|	Merge pull request #14949 from bogdan/empty-hash-array-parameterization	Rafael Mendonça França	2014-05-04	3	-9/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	[Fixes #14948] Hash#to_query: right serialization for empty hash and array
\| * \| \| \| \|	[Fixes #14948] Hash#to_query: Changed a way how empty hash and empty array ↵	Bogdan Gusiev	2014-05-03	3	-9/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	are serialized Empty Hash or Array should not present in serialization result {a: []}.to_query # => "" {a: {}}.to_query # => "" For more info see #14948.
* \| \| \| \| \|	Invert the if/else clause	Rafael Mendonça França	2014-05-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The case where the value is present is more common
* \| \| \| \| \|	Merge pull request #14946 from jcoleman/fix-null-binary-column-logging-exception	Rafael Mendonça França	2014-05-04	3	-1/+20
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix exception when logging SQL w/ nil binary value. Conflicts: activerecord/CHANGELOG.md
\| * \| \| \| \| \|	Fix exception when logging SQL w/ nil binary value.	James Coleman	2014-05-02	3	-1/+20
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #14973 from kuldeepaggarwal/f-refactor	Rafael Mendonça França	2014-05-04	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert column name to string only once
\| * \| \| \| \| \| \|	Convert column name to string only once	Kuldeep Aggarwal	2014-05-04	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #14974 from kuldeepaggarwal/remove-deprecated-files	Rafael Mendonça França	2014-05-04	2	-14/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated file
\| * \| \| \| \| \| \| \|	Remove deprecated file(`active_support/core_ext/object/to_json.rb`) and its ↵	Kuldeep Aggarwal	2014-05-04	2	-14/+0
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test case.
* \| \| \| \| \| \| \|	Merge pull request #14961 from jonatack/patch-7	Robin Dupret	2014-05-04	1	-89/+74
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Follow-up to #14905 and formatting pass [ci skip]
\| * \| \| \| \| \| \|	Follow-up to #14905 and formatting pass	Jon Atack	2014-05-04	1	-89/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on the Getting Started guide. [skip ci] Added 2 changes suggested by @robin850 [skip ci]
* \| \| \| \| \| \| \|	Fix examples indent and improve #process docs a bit [ci skip]	Carlos Antonio da Silva	2014-05-04	1	-16/+14
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Use the reader attribute rather than the instance var when possible	Carlos Antonio da Silva	2014-05-04	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Simplify building options hash in rename column method for mysql	Carlos Antonio da Silva	2014-05-04	1	-5/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Get rid of conditional since column_for handles raising now	Carlos Antonio da Silva	2014-05-04	1	-7/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	column_for will raise in case column is not found for the given table, so there is no need to handle that here.
* \| \| \| \| \| \| \|	Simplify unless conditional with OR	Carlos Antonio da Silva	2014-05-04	1	-4/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Convert column name to string only once	Carlos Antonio da Silva	2014-05-04	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Rails One Click is not maintained anymore [ci skip]	Robin Dupret	2014-05-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let's tell people that they should rely on Tokaido instead of Rails One Click. Fixes #14960.
* \| \| \| \| \| \| \|	Merge pull request #14923 from gaurish/document-testcase-process	Yves Senn	2014-05-04	1	-0/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document ActionController::TestCase::Behavior#process [ci skip]
\| * \| \| \| \| \| \| \|	Document ActionController::TestCase::Behavior#process	Gaurish Sharma	2014-05-04	1	-0/+27
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	refactor, move `column_for` to `AbstractAdapter` for better reuse.	Yves Senn	2014-05-04	4	-17/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #14966 from ↵	Yves Senn	2014-05-04	5	-21/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tgxworld/remove_unnecessary_setting_of_controller_name Remove tests method for test cases when controller can be inferred.
\| * \| \| \| \| \| \| \|	Remove tests method for test cases when controller can be inferred.	Guo Xiang	2014-05-03	5	-21/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #14959 from akshay-vishnoi/doc_changes	Robin Dupret	2014-05-04	1	-4/+5
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Typo, grammar and textual changes [ci skip]
\| * \| \| \| \| \| \| \|	Typo, grammar and textual changes [ci skip]	Akshay Vishnoi	2014-05-03	1	-4/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Revert "Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar"	Yves Senn	2014-05-03	4	-114/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit fe9859600824268ff614cb3eb48b62c7165a1fbd, reversing changes made to add9560643ef79830febf47fa1228752d1df3502.
* \| \| \| \| \| \| \| \|	Merge pull request #14940 from arunagw/hbakhtiyor-test-db-namespaces-ar	Yves Senn	2014-05-03	4	-102/+114
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Reorganize ActiveRecord's rake tasks
\| * \| \| \| \| \| \| \|	Reorganize ActiveRecord tasks [Arun Agrawal & Abd ar-Rahman Hamidi]	Arun Agrawal	2014-05-03	4	-102/+114
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove duplicated fixture addition	Carlos Antonio da Silva	2014-05-03	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Refactor test to not care about the specific result of valid?	Carlos Antonio da Silva	2014-05-03	1	-3/+4
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only care about its truthiness rather than asserting specific true/false values. If we need to check for the return value in particular, there will be a test for that.
* \| \| \| \| \| \| \|	Merge pull request #14952 from gregmolnar/schema_load	Yves Senn	2014-05-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make `db:structure:load` listed with `rake -T`
\| * \| \| \| \| \| \| \|	make `db:structure:load` listed with `rake -T`	Greg Molnar	2014-05-02	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	docs, restructure newly added part to `includes`. [ci skip]	Yves Senn	2014-05-03	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a follow up to #14139. /cc @carlosantoniodasilva
* \| \| \| \| \| \| \| \|	Merge pull request #14924 from eric-chahin/issue_13854	Matthew Draper	2014-05-03	5	-1/+31
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed custom validation context bug for child associations
\| * \| \| \| \| \| \| \| \|	Fixed custom validation context bug where child	Eric Chahin	2014-05-01	5	-1/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	associations were not being saved. Fixes #13854. [Eric Chahin, Aaron Nelson, & Kevin Casey]