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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\ \
\| * \|	rename sequence only if it exists	Abdelkader Boudih	2014-06-27	3	-3/+17
* \| \|	Merge pull request #15943 from wagenet/cache-instrumentation	Rafael Mendonça França	2014-06-27	2	-11/+17
\|\ \ \
\| * \| \|	Always instrument ActiveSupport::Cache	Peter Wagenet	2014-06-27	1	-11/+10
* \| \| \|	Merge pull request #15933 from rafael/master	Rafael Mendonça França	2014-06-27	6	-5/+99
\|\ \ \ \
\| * \| \| \|	Improvements per code review.	Rafael Chacón	2014-06-27	4	-5/+60
\| * \| \| \|	Add always_permitted_parameters as an option.	Rafael Chacón	2014-06-26	3	-5/+38
* \| \| \| \|	Merge pull request #15946 from jamesprior/patch-1	Rafael Mendonça França	2014-06-27	1	-1/+2
\|\ \ \ \ \
\| * \| \| \| \|	Update documentation for run_callbacks	jamesprior	2014-06-27	1	-1/+2
* \| \| \| \| \|	Do not change the global state of the test suite	Rafael Mendonça França	2014-06-27	2	-18/+2
\|/ / / / /
* \| \| \| \|	Improve tests to use add_foreign_key DSL	Rafael Mendonça França	2014-06-27	1	-18/+11
* \| \| \| \|	MySQL doesn't works with foreign key	Rafael Mendonça França	2014-06-27	1	-3/+2
* \| \| \| \|	We are talking about the libraries, not the constants	Sean Griffin	2014-06-27	1	-3/+3
* \| \| \| \|	Note that `_will_change!` is no longer needed for AR instances	Sean Griffin	2014-06-27	1	-3/+5
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Talk about config.assts.version move too	Rafael Mendonça França	2014-06-27	1	-1/+1
* \| \| \|	Merge pull request #12450 from iantropov/master	Rafael Mendonça França	2014-06-27	5	-5/+59
\|\ \ \ \
\| * \| \| \|	Fix bug, when ':dependent => :destroy' option violates foreign key constraint...	Ivan Antropov	2013-10-26	5	-9/+61
* \| \| \| \|	Merge pull request #15788 from sgrif/sg-mutable-strings	Rafael Mendonça França	2014-06-27	5	-13/+77
\|\ \ \ \ \
\| * \| \| \| \|	Detect in-place modifications on Strings	Sean Griffin	2014-06-17	4	-13/+55
* \| \| \| \| \|	Merge pull request #8639 from bogdan/valid-with-bang	Rafael Mendonça França	2014-06-27	3	-1/+36
\|\ \ \ \ \ \