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

	Commit message (Expand)	Author	Age	Files	Lines
*	Deprecate unused quoted_locking_column method.	kennyj	2013-09-24	3	-0/+9
*	Merge pull request #12329 from benmanns/docrails	Rafael Mendonça França	2013-09-23	1	-3/+3
\|\
\| *	Update references to wycats/thor to erikhuda/thor.	Benjamin Manns	2013-09-23	1	-3/+3
\|/
*	Merge pull request #12325 from tjschuck/bcrypt_version_bump	Rafael Mendonça França	2013-09-23	4	-6/+6
\|\
\| *	bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows	T.J. Schuck	2013-09-23	4	-6/+6
* \|	Fix the model name in the association basics guides	Rafael Mendonça França	2013-09-23	1	-1/+4
* \|	Merge pull request #12315 from gaurish/super	Rafael Mendonça França	2013-09-23	1	-26/+28
\|\ \ \| \|/ \|/\|
\| *	We shouldn't override PostgreSQLAdapter's superclass inheritance while monkey...	Gaurish Sharma	2013-09-23	1	-26/+28
* \|	Merge pull request #10773 from wangjohn/link_and_routing_options	Rafael Mendonça França	2013-09-23	2	-2/+16
\|\ \
\| * \|	Adding documentation to +polymorphic_url+	wangjohn	2013-06-13	2	-2/+16
* \| \|	Merge pull request #11987 from wangjohn/schema_dumper_options	Rafael Mendonça França	2013-09-23	1	-5/+16
\|\ \ \
\| * \| \|	Creating options for schema dumper.	wangjohn	2013-08-22	1	-5/+16
* \| \| \|	Merge pull request #12070 from wangjohn/small_refactors_to_generators	Rafael Mendonça França	2013-09-23	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Small refactoring changes to generators.	wangjohn	2013-08-29	2	-5/+9
* \| \| \| \|	Merge pull request #12287 from bogdan/select-with-selected-option	Rafael Mendonça França	2013-09-23	3	-1/+22
\|\ \ \ \ \
\| * \| \| \| \|	Fix some edge cases for AV `select` helper with `:selected` option	Bogdan Gusiev	2013-09-23	3	-1/+22
\|/ / / / /
* \| \| \| \|	Fix the documentation method.	Rafael Mendonça França	2013-09-23	1	-1/+1
* \| \| \| \|	Expand select documentation to tell about the block	Rafael Mendonça França	2013-09-23	1	-0/+9
* \| \| \| \|	Use ERB in the CHANGELOG [ci skip]	Rafael Mendonça França	2013-09-23	1	-3/+5
* \| \| \| \|	Merge pull request #11055 from bogdan/select-with-block	Rafael Mendonça França	2013-09-23	4	-5/+29
\|\ \ \ \ \
\| * \| \| \| \|	Ability to pass block to AV#select helper	Bogdan Gusiev	2013-09-23	4	-5/+29
* \| \| \| \| \|	No need to abbreviate ActiveModel	Rafael Mendonça França	2013-09-23	1	-1/+1
* \| \| \| \| \|	Document reset_changes since it is part of public API	Rafael Mendonça França	2013-09-23	1	-0/+12
* \| \| \| \| \|	Merge pull request #10816 from bogdan/less-dirty-dirty	Rafael Mendonça França	2013-09-23	7	-26/+32
* \| \| \| \| \|	Merge pull request #12321 from bogdan/time-with-zone-succ	Rafael Mendonça França	2013-09-23	1	-0/+5
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Changelog entry for pr #11474	Bogdan Gusiev	2013-09-23	1	-0/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #12314 from JuanitoFatas/migrations	Yves Senn	2013-09-23	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Add a type modifier in migrations.md.	Juanito Fatas	2013-09-22	1	-0/+1
* \| \| \| \| \|	Merge pull request #11060 from schneems/schneems/multi-stdout-logging-master	Guillermo Iguaran	2013-09-22	3	-2/+18
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Only output Server logs in Development	schneems	2013-09-22	3	-2/+18
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #9155 from bogdan/route-formatter	Andrew White	2013-09-22	1	-23/+23
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Rewrite journey routes formatter for performance	Bogdan Gusiev	2013-08-28	1	-23/+23
* \| \| \| \| \| \|	Merge pull request #11474 from bogdan/time-with-zone-succ	Andrew White	2013-09-22	3	-0/+47
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Disable ability to iterate over a Range of TimeWithZone	Bogdan Gusiev	2013-07-19	3	-0/+47
* \| \| \| \| \| \| \|	Merge pull request #12317 from nashby/collection-label-namespace	Rafael Mendonça França	2013-09-22	4	-1/+43
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	handle `:namespace` form option in collection labels	Vasiliy Ermolovich	2013-09-22	4	-1/+43
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #11382 from kennyj/fix_10751-2	Rafael Mendonça França	2013-09-22	3	-3/+13
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Migration dump UUID default functions to schema.rb. Fixes #10751.	kennyj	2013-07-10	3	-3/+12
\| * \| \| \| \| \| \| \|	Fix typo.	kennyj	2013-07-10	1	-1/+1
* \| \| \| \| \| \| \| \|	Give the credits [ci skip]	Rafael Mendonça França	2013-09-22	1	-0/+2
* \| \| \| \| \| \| \| \|	Merge pull request #10500 from kennyj/fix_10450	Rafael Mendonça França	2013-09-22	3	-3/+50
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fixed a bug in when using has_many association with :inverse_of option and U...	kennyj	2013-05-08	3	-3/+48
* \| \| \| \| \| \| \| \| \|	Merge pull request #12281 from kennyj/add_doc_about_12276	Rafael Mendonça França	2013-09-22	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Add some comment about downcase url encoded string.	kennyj	2013-09-22	1	-0/+2
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #12316 from JuanitoFatas/engines	Rafael Mendonça França	2013-09-22	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	[ci skip] Add missing migrate step in generating comment resource section.	Juanito Fatas	2013-09-22	1	-1/+5
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #12311 from kennyj/fix_typo_about_uuid	Rafael Mendonça França	2013-09-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fix typo. This test isn't executed in even postgresql.	kennyj	2013-09-22	1	-1/+1
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Add back options argument in the ActiveRecord::Base.initialize method	Rafael Mendonça França	2013-09-21	1	-2/+10
* \| \| \| \| \| \| \| \|	Merge pull request #12307 from douglascalhoun/patch-1	Vijay Dev	2013-09-21	1	-2/+0
\|\ \ \ \ \ \ \ \ \