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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Ensure that .process return the method return	Arthur Neves	2014-05-06	2	-9/+13
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	several enhancements to humanize [closes #12288]	Xavier Noria	2014-05-06	4	-19/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Strips leading underscores. * Changes some unnecessary gsub!s to sub!s. * Replaces some anchors ^, $ with \A, \z. * Documents that human inflection rules are applied. * Documents that words are downcased except acronyms. * Adds an example with an acronym. * Rewords docs.
* \| \| \| \| \| \| \|	Merge pull request #14982 from eric-chahin/GBV_refactor	Rafael Mendonça França	2014-05-06	2	-8/+6
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Refactored AssociationScope#get_bind_values
\| * \| \| \| \| \| \|	Refactor AssociationScope#get_bind_values	Eric Chahin	2014-05-05	2	-8/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added #join_id_for(owner) to reflection to avoid accessing the source_macro
* \| \| \| \| \| \| \|	Merge pull request #14945 from tomkadwill/form_authenticity_param_refactor	Rafael Mendonça França	2014-05-06	3	-6/+34
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved 'params[request_forgery_protection_token]' into its own method and...
\| * \| \| \| \| \| \| \|	Moved 'params[request_forgery_protection_token]' into its own method and ↵	Tom Kadwill	2014-05-06	3	-6/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	improved tests.
* \| \| \| \| \| \| \| \|	Only accept actions without File::SEPARATOR in the name.	Rafael Mendonça França	2014-05-06	2	-4/+41
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will avoid directory traversal in implicit render. Fixes: CVE-2014-0130 Conflicts: actionpack/lib/abstract_controller/base.rb
* \| \| \| \| \| \| \|	Merge pull request #14990 from fredwu/has_many_through_association_doc_grammar	Yves Senn	2014-05-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed grammar [ci skip]
\| * \| \| \| \| \| \| \|	Fixed grammar	Fred Wu	2014-05-06	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'postgres/guide'	Yves Senn	2014-05-06	1	-0/+338
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	pg guides, some stylistic changes [ci skip]	Yves Senn	2014-05-06	1	-20/+21
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	pg guide, advanced features [ci skip]	Yves Senn	2014-05-06	1	-18/+46
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	pg guide, datatypes and examples. [ci skip]	Yves Senn	2014-05-06	1	-0/+309
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #12667 from nateberkopec/make_guides_html_valid	Yves Senn	2014-05-06	11	-17/+18
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Guide HTML validation
\| * \| \| \| \| \| \| \|	Guides: output valid HTML5	Nate Berkopec	2014-05-05	11	-17/+18
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge pull request #14984 from jkingdon/add-jdbcmysql	Rafael Mendonça França	2014-05-05	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix rails dbconsole for jdbcmysql adapter
\| * \| \| \| \| \| \| \|	Fix rails dbconsole for jdbcmysql adapter.	Gabriel Gilder and Jim Kingdon	2014-05-05	1	-1/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #14985 from eileencodes/refactor-delete-all-method	Guillermo Iguaran	2014-05-05	1	-9/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	refactor and clean up delete_all method
\| * \| \| \| \| \| \|	refactor and clean up delete_all method	eileencodes	2014-05-05	1	-9/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that delete_all with destroy or delete_all dependency behave the same we no longer need this conditional. This means we can remove the new delete_all_with_dependency method I added and go straight to delete_records from delete_all, passing :all and the dependent directly.
* \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \|