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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #14861 from igor04/dirty-rollback	Rafael Mendonça França	2014-06-30	2	-0/+35
\|\
\| *	Added rollback method to ActiveModel::Dirty	igor04	2014-06-23	2	-0/+35
* \|	Merge pull request #15991 from sgrif/sg-has-attribute	Rafael Mendonça França	2014-06-30	1	-6/+1
\|\ \
\| * \|	Don't add a second method for attribute existence	Sean Griffin	2014-06-30	1	-6/+1
\|/ /
* \|	Merge pull request #15989 from nickpellant/master	Rafael Mendonça França	2014-06-30	1	-1/+1
\|\ \
\| * \|	Fix 10.3 invite_email.body assert_match example.	Nick Pellant	2014-06-30	1	-1/+1
\|/ /
* \|	Move STI docs off of the main Base document, leaving a note	Sean Griffin	2014-06-30	2	-28/+34
* \|	Merge pull request #15987 from jamesprior/patch-2	Sean Griffin	2014-06-30	1	-0/+9
\|\ \
\| * \|	Update documentation on STI change handling	jamesprior	2014-06-30	1	-0/+9
\|/ /
* \|	Merge pull request #15981 from sgrif/sg-simplify-defaults	Rafael Mendonça França	2014-06-29	3	-21/+9
\|\ \
\| * \|	Simplify creation of default attributes on AR instance	Sean Griffin	2014-06-29	4	-21/+10
* \| \|	Merge pull request #15977 from sgrif/sg-remove-array-hack	Godfrey Chan	2014-06-29	1	-24/+0
\|\ \ \
\| * \| \|	Remove array workaround in PG quoting	Sean Griffin	2014-06-29	1	-24/+0
* \| \| \|	Merge pull request #15978 from sgrif/sg-pg-array-member	Godfrey Chan	2014-06-29	2	-12/+9
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Remove unused `array_member` from PG quoting for HStore columns	Sean Griffin	2014-06-29	2	-12/+9
\|/ / /
* \| \|	Merge pull request #15983 from sgrif/sg-inline-point	Godfrey Chan	2014-06-29	3	-19/+9
\|\ \ \
\| * \| \|	Use the type object when sending point columns to the DB	Sean Griffin	2014-06-29	3	-19/+9
* \| \| \|	Merge pull request #15976 from sgrif/sg-attribute-exists	Godfrey Chan	2014-06-29	1	-2/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Don't encourage usage of `columns_hash`	Sean Griffin	2014-06-29	1	-2/+7
* \| \| \|	Merge pull request #15982 from sgrif/sg-attr-set-map-values	Godfrey Chan	2014-06-29	2	-7/+4
\|\ \ \ \
\| * \| \| \|	Use `Hash#transform_values` to clean up `AttributeSet`	Sean Griffin	2014-06-29	2	-7/+4
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #15979 from sgrif/sg-json-quoting	Godfrey Chan	2014-06-29	4	-23/+11
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Use the type object for sending JSON to the database	Sean Griffin	2014-06-29	4	-23/+11
\| \|/ /
* \| \|	Merge pull request #15819 from sgrif/sg-hash-map-values	Guillermo Iguaran	2014-06-29	4	-0/+76
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add `Hash#map_values` to ActiveSupport	Sean Griffin	2014-06-29	4	-0/+76
\|/ /
* \|	Tiny documentation fixes [ci skip]	Robin Dupret	2014-06-29	3	-5/+5
* \|	Quick pass through Active Support and guides CHANGELOG	Robin Dupret	2014-06-29	2	-3/+5
* \|	Merge pull request #15961 from mckramer/patch-1	Rafael Mendonça França	2014-06-29	1	-2/+2
\|\ \
\| * \|	Rename options param of #time_ago_in_words to match API change	Max Kramer	2014-06-28	1	-2/+2
* \| \|	Merge pull request #15962 from sgrif/sg-types-for-defaults	Rafael Mendonça França	2014-06-29	8	-28/+25
\|\ \ \
\| * \| \|	Always pass a column with a type object to quote	Sean Griffin	2014-06-28	8	-28/+25
\| \|/ /
* \| \|	Merge pull request #15963 from roryokane/getting-started-guide-fix-grammar	Sean Griffin	2014-06-28	1	-3/+3
\|\ \ \
\| * \| \|	Add punctuation and fix capitalization in Getting Started guide	Rory O’Kane	2014-06-28	1	-3/+3
\| \|/ /
* \| \|	Merge pull request #15964 from JuanitoFatas/doc/patch-01	Sean Griffin	2014-06-28	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	[ci skip] Fix router option reference in 4.2 release notes.	Juanito Fatas	2014-06-29	1	-1/+1
* \| \|	Merge pull request #15957 from seuros/duplicate	Yves Senn	2014-06-28	1	-12/+3
\|\ \ \
\| * \| \|	[Postgresql tests] remove duplicate helper	Abdelkader Boudih	2014-06-28	1	-12/+3
* \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2014-06-28	1	-3/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	[ci skip] Add missing colon and period in initialization.md.	Juanito Fatas	2014-06-25	1	-3/+3
\| * \| \|	Revert "Formatting fix in AS changelog [ci skip]"	Rafael Mendonça França	2014-06-16	1	-5/+2
\| * \| \|	Formatting fix in AS changelog [ci skip]	Juanjo Bazán	2014-06-16	1	-2/+5
* \| \| \|	Merge pull request #15955 from JuanitoFatas/levenshtein-guide	Guillermo Iguaran	2014-06-28	1	-21/+29
\|\ \ \ \
\| * \| \| \|	Update the levenshtein distance method in guides.	Juanito Fatas	2014-06-28	1	-21/+29
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #15954 from roryokane/getting-started-guide-add-period	Sean Griffin	2014-06-28	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Add missing period in Getting Started guide	Rory O’Kane	2014-06-28	1	-1/+1
\|/ / /
* \| \|	Merge pull request #15951 from pcreux/fix-mysql-test-fk	Godfrey Chan	2014-06-27	1	-1/+4
\|\ \ \
\| * \| \|	MySQL doesn't work with foreign keys	Philippe Creux	2014-06-27	1	-1/+4
\|/ / /
* \| \|	Merge pull request #15949 from pcreux/fix-add-foreign-key-in-test	Godfrey Chan	2014-06-27	1	-1/+1
\|\ \ \
\| * \| \|	Fix test with add_foreign_key DSL in 9d21ef9	Philippe Creux	2014-06-27	1	-1/+1
\|/ / /
* \| \|	Merge pull request #15934 from seuros/rename	Rafael Mendonça França	2014-06-27	3	-3/+17
\|\ \ \