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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \|	Merge branch 'master' of github.com:rails/rails	David Heinemeier Hansson	2013-04-19	9	-15/+66
\|\ \ \ \ \
\| * \| \| \| \|	Revert "Merge pull request #10183 from jholton/fix_association_auto_save"	Jon Leighton	2013-04-19	3	-29/+9
\| * \| \| \| \|	Merge pull request #10183 from jholton/fix_association_auto_save	Jon Leighton	2013-04-19	3	-9/+29
\| \|\ \ \ \ \
\| \| * \| \| \| \|	destroys association records before saving/inserting new association records	Johnny Holton	2013-04-19	3	-9/+29
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #10264 from cconstantine/master	Rafael Mendonça França	2013-04-19	2	-1/+7
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Fix loading of fixtures when the column type is a postgres array of strings.	Chris Constantine	2013-04-18	2	-1/+7
\| \| \|/ / / /
\| * \| \| \| \|	Improve the error message	Rafael Mendonça França	2013-04-19	2	-2/+2
\| * \| \| \| \|	Merge pull request #10217 from mirasrael/make-migrator-run-transactional-4.0	Rafael Mendonça França	2013-04-19	3	-5/+42
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Support transactions in Migrator.run	bondarev	2013-04-18	3	-5/+42
\| * \| \| \| \| \|	Merge pull request #10200 from calebthompson/ct-fix-freeze-freezing-cloned-mo...	Jon Leighton	2013-04-19	2	-2/+11
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Fix freeze applying to cloned objects	Caleb Thompson	2013-04-15	2	-2/+11
\| * \| \| \| \| \|	Merge pull request #10235 from joergleis/patch-1	Michael Koziarski	2013-04-18	1	-5/+4
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Reorganize MessageEncryptor	jgls	2013-04-19	1	-5/+4
\| * \| \| \| \| \|	Unindent attributes iteration in scaffold index template	Carlos Antonio da Silva	2013-04-18	1	-2/+2
* \| \| \| \| \| \|	Alignment	David Heinemeier Hansson	2013-04-18	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Indent around the scaffold loop	David Heinemeier Hansson	2013-04-18	1	-8/+8
* \| \| \| \| \|	HTML5 breaks	David Heinemeier Hansson	2013-04-18	2	-4/+4
* \| \| \| \| \|	Better ordering	David Heinemeier Hansson	2013-04-18	1	-3/+3
* \| \| \| \| \|	Revert "Merge pull request #10043 from cconstantine/master"	Rafael Mendonça França	2013-04-18	2	-21/+0
* \| \| \| \| \|	Use sprockets-rails 2.0.0.rc4	Guillermo Iguaran	2013-04-18	1	-1/+1
* \| \| \| \| \|	Use sass-rails 4.0.0.rc1	Rafael Mendonça França	2013-04-18	1	-1/+1
* \| \| \| \| \|	Use the same uglifier version that the generated applications	Rafael Mendonça França	2013-04-18	1	-1/+1
* \| \| \| \| \|	Use latest coffee-rails release	Rafael Mendonça França	2013-04-18	2	-2/+2
* \| \| \| \| \|	Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet."	Rafael Mendonça França	2013-04-18	1	-2/+2
* \| \| \| \| \|	Bump arel to 4.0.0	Rafael Mendonça França	2013-04-18	1	-1/+1
* \| \| \| \| \|	Merge pull request #10043 from cconstantine/master	Rafael Mendonça França	2013-04-18	2	-0/+21
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix loading of string arrays in postgres	Chris Constantine	2013-04-08	2	-0/+21
* \| \| \| \| \| \|	Add CHANGELOG entries - closes #10180, #10185	Andrew White	2013-04-18	1	-0/+10
* \| \| \| \| \| \|	Refactor ActionDispatch::Http::URL.build_host_url	Andrew White	2013-04-18	2	-20/+90
* \| \| \| \| \| \|	Add url generation tests for #10185	Andrew White	2013-04-18	1	-0/+2
* \| \| \| \| \| \|	Duplicate options before mutating them	Andrew White	2013-04-18	2	-3/+5
* \| \| \| \| \| \|	Passing subdomain: '' to url_for removes the subdomain (instead of adding a l...	Derek Watson	2013-04-18	4	-1/+32
* \| \| \| \| \| \|	Merge pull request #10262 from printercu/patch-3	Rafael Mendonça França	2013-04-18	2	-0/+7
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Avoid leak into controller's action_methods	printercu	2013-04-18	2	-0/+7
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #10258 from thenickcox/pending_migrations_plural	Rafael Mendonça França	2013-04-18	1	-3/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix subject-verb agreement in error msg (and other grammar stuff)	thenickcox	2013-04-17	1	-3/+3
* \| \| \| \| \| \| \|	Merge pull request #10259 from prathamesh-sonpatki/secure-engine-tests	Carlos Antonio da Silva	2013-04-17	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Use secure source for rubygems in engine tests	Prathamesh Sonpatki	2013-04-18	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #10255 from wangjohn/increment_or_decrement_refactoring_in...	Carlos Antonio da Silva	2013-04-17	1	-18/+14
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	The increment and decrement commands in the local cache are exactly the	wangjohn	2013-04-17	1	-18/+14
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #10254 from wangjohn/refactoring_local_cache	Carlos Antonio da Silva	2013-04-17	1	-8/+6
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Refactored the storage of a temporary version of the local cache into	wangjohn	2013-04-17	1	-8/+6
\|/ / / / / / / /
* \| \| \| \| \| \| \|	activerecord-deprecated_finders 1.0.0 has a bug with has_many :through	Rafael Mendonça França	2013-04-17	1	-1/+1
* \| \| \| \| \| \| \|	Merge pull request #10252 from epiclabs/nodoc_registries	Rafael Mendonça França	2013-04-17	2	-4/+4
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	add :nodoc: mark to *Registry classes [ci skip]	Francesco Rodriguez	2013-04-17	3	-5/+5
* \| \| \| \| \| \| \| \|	Add nodoc to LocalCacheRegistry	Rafael Mendonça França	2013-04-17	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #10250 from wangjohn/local_cache_registry	Rafael Mendonça França	2013-04-17	1	-15/+32
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Adding a local thread registry to store local caches.	wangjohn	2013-04-17	1	-15/+32
* \| \| \| \| \| \| \| \|	adding a test for root path in the app	Aaron Patterson	2013-04-17	1	-0/+24
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Don't need to add activerecord-deprecated_finders on edge and dev	Rafael Mendonça França	2013-04-17	1	-3/+1