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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' into adequaterecord	Aaron Patterson	2014-02-26	111	-4483/+852
\|\
\| *	Merge pull request #14211 from loganhasson/master	Xavier Noria	2014-02-26	1	-12/+12
\| \|\
\| \| *	[ci skip] Move association class method notes	Logan Hasson	2014-02-26	1	-12/+12
\| * \|	extract common code in `uuid_test.rb`.	Yves Senn	2014-02-26	1	-60/+57
\| * \|	move PostgreSQL UUID tests from `datatype_test.rb` to `uuid_test.rb`.	Yves Senn	2014-02-26	2	-16/+36
\| * \|	Merge pull request #14208 from lukesteensen/remove-migration-example	Xavier Noria	2014-02-26	1	-153/+0
\| \|\ \
\| \| * \|	[ci skip] remove guide section on models in migrations	Luke Steensen	2014-02-26	1	-153/+0
\| \|/ /
\| * \|	test case for custom PostgreSQL enum type.	Yves Senn	2014-02-26	1	-0/+38
\| * \|	Merge pull request #14149 from tjschuck/bcrypt_gem_rename	Carlos Antonio da Silva	2014-02-26	4	-7/+11
\| \|\ \
\| \| * \|	Bump version of bcrypt gem	T.J. Schuck	2014-02-25	4	-7/+11
\| * \| \|	Remove inclusion of rubysl gem for rbx on generated Gemfile	Carlos Antonio da Silva	2014-02-25	2	-16/+0
\| * \| \|	let `insert_record` actuall save the object.	Aaron Patterson	2014-02-25	4	-4/+32
\| * \| \|	Merge pull request #14200 from spencer1248/fix_typo_in_app_generator_test_name	Carlos Antonio da Silva	2014-02-25	1	-1/+1
\| \|\ \ \
\| \| * \| \|	[skip ci] Fix test name typo in app generator tests.	Spencer Rogers	2014-02-25	1	-1/+1
\| * \| \| \|	Merge remote-tracking branch 'chancancode/fix_instance_method_already_impleme...	Jon Leighton	2014-02-25	5	-13/+31
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Fixed STI classes not defining an attribute method if there is a	Godfrey Chan	2014-02-23	5	-13/+31
\| * \| \| \|	Merge pull request #14199 from arthurnn/travis_211	Guillermo Iguaran	2014-02-25	1	-2/+1
\| \|\ \ \ \
\| \| * \| \| \|	travis s/2.1.0/2.1.1	Arthur Neves	2014-02-25	1	-2/+1
\| \|/ / / /
\| * \| \| \|	Merge pull request #14152 from schneems/schneems/fix-ar-wtf-why-is-there-no-e...	Aaron Patterson	2014-02-25	2	-24/+13
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| \| * \| \|	Handle missing environment from non empty config	schneems	2014-02-21	2	-24/+13
\| * \| \| \|	Merge pull request #14177 from yahonda/skip_tests_if_duplicate_index_not_allowed	Yves Senn	2014-02-25	1	-10/+13
\| \|\ \ \ \
\| \| * \| \| \|	Skip test_migrate_revert_add_index_with_name if databases	Yasuo Honda	2014-02-25	1	-10/+13
\| * \| \| \| \|	Optimize getting started guide images, and use png instead of jpg	Carlos Antonio da Silva	2014-02-25	16	-1/+1
\| * \| \| \| \|	:scissors: [ci skip]	Carlos Antonio da Silva	2014-02-25	1	-5/+5
\| \|/ / / /
\| * \| \| \|	Merge pull request #14193 from ys/patch-1	Vijay Dev	2014-02-25	1	-1/+1
\| \|\ \ \ \
\| \| * \| \| \|	Add missing parantheses in index_exists?	Yannick Schutz	2014-02-25	1	-1/+1
\| * \| \| \| \|	Point master changelogs to 4-1-stable branch	Carlos Antonio da Silva	2014-02-25	8	-3831/+8
\| \|/ / / /
\| * \| \| \|	`ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191.	Yves Senn	2014-02-25	1	-1/+0
\| * \| \| \|	Merge pull request #14006 from Loremaster/strong_params_improvement	Xavier Noria	2014-02-25	3	-6/+28
\| \|\ \ \ \
\| \| * \| \| \|	Simple Sungularize ActionController::UnpermittedParameters error in case when...	Serj L	2014-02-24	3	-6/+28
\| * \| \| \| \|	Merge pull request #14186 from ch33hau/standardized-punctuation	Yves Senn	2014-02-25	1	-3/+3
\| \|\ \ \ \ \
\| \| * \| \| \| \|	[skip ci] Standardized punctuation.	ch33hau	2014-02-25	1	-3/+3
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #14182 from mecampbellsoup/fix_typo_in_url_helper_docs	Arthur Nogueira Neves	2014-02-24	1	-1/+1
\| \|\ \ \ \ \
\| \| * \| \| \| \|	[skip ci] Fix typo in link_to :method option description	Matt Campbell	2014-02-24	1	-1/+1
\| \|/ / / / /
\| * \| \| \| \|	refactor, with_locale is not needed because I18n is mocked.	Yves Senn	2014-02-24	1	-7/+5
\| * \| \| \| \|	Merge pull request #14170 from kritik/master	Yves Senn	2014-02-24	3	-2/+20
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Fix ActionView label translation for more than 10 nested elements	Vladimir Krylov	2014-02-24	3	-2/+20
\| \|/ / / / /
\| * \| \| \| \|	Go with #presence_in instead of #present_in -- it doesnt sound quite as good,...	David Heinemeier Hansson	2014-02-24	3	-7/+7
\| * \| \| \| \|	refactor, extract `with_locale` helper.	Yves Senn	2014-02-24	1	-87/+79
\| * \| \| \| \|	build fix. follow up to 174c9f0df39cd338a4871f82794256cc64f68a81	Yves Senn	2014-02-24	1	-1/+1
\| \|/ / / /
\| * \| \| \|	include names in model generator warning message. refs #13515.	Yves Senn	2014-02-24	2	-5/+7
\| * \| \| \|	Merge pull request #10497 from senny/10485_does_not_coerce_strings	Yves Senn	2014-02-24	4	-7/+50
\| \|\ \ \ \
\| \| * \| \| \|	Coerce strings when reading attributes.	Yves Senn	2014-02-23	4	-7/+50
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge pull request #14171 from arthurnn/extract_middleware_cache	Guillermo Iguaran	2014-02-23	2	-32/+41
\| \|\ \ \ \
\| \| * \| \| \|	Extract local cache middleware	Arthur Neves	2014-02-23	2	-32/+41
\| \| \|/ / /
\| * \| \| \|	Group assets options in production env template	Carlos Antonio da Silva	2014-02-23	1	-6/+4
\| * \| \| \|	Introduce Concern#class_methods and Kernel#concern	Jeremy Kemper	2014-02-23	7	-18/+113
\| \|/ / /
\| * \| \|	Merge pull request #13793 from senny/postgres/dynamic_range_oid	Yves Senn	2014-02-23	4	-63/+147
\| \|\ \ \
\| \| * \| \|	deprecate support for pg ranges with excluding beginnings.	Yves Senn	2014-02-23	3	-23/+78
\| \| * \| \|	dynamically define PostgreSQL OID range types.	Yves Senn	2014-02-23	4	-52/+81