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-03-13	141	-895/+2119
\|\
\| *	make tests pass on Ruby 2.2	Aaron Patterson	2014-03-13	2	-5/+5
\| *	Use Sqlite3 adapter in examples	Julian Simioni	2014-03-12	1	-2/+2
\| *	use the body proxy to freeze headers	Aaron Patterson	2014-03-12	5	-12/+57
\| *	just ask the response for the commit status, we do not need to ask the jar	Aaron Patterson	2014-03-12	1	-1/+1
\| *	only write the jar if the response isn't committed	Aaron Patterson	2014-03-12	6	-10/+57
\| *	Merge pull request #14366 from sukolsak/grammar	Lauro Caetano	2014-03-12	1	-1/+1
\| \|\
\| \| *	Fix a grammatical error in the i18n guide [ci skip]	sukolsak	2014-03-12	1	-1/+1
\| * \|	Merge pull request #14364 from why-el/better-docs-for-update-attribute	Arthur Nogueira Neves	2014-03-12	1	-0/+2
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Enhance docs for update_attribute [ci-skip]	Mohamed Wael Khobalatte	2014-03-12	1	-0/+2
\| * \|	use method_defined? to check whether or not a method is defined	Aaron Patterson	2014-03-12	1	-1/+1
\| * \|	Merge pull request #14363 from arthurnn/usec_tests_mysql56	Rafael Mendonça França	2014-03-12	2	-3/+10
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Change usec to 0 on tests that compare seconds	Arthur Neves	2014-03-12	1	-3/+3
\| \| *	Unit test for mysql quote time usec	Arthur Neves	2014-03-12	1	-0/+7
\| \|/
\| *	Merge pull request #13040 from kamipo/case_sensitive_comparison	Rafael Mendonça França	2014-03-12	6	-6/+62
\| \|\
\| \| *	Only use BINARY for mysql case sensitive uniqueness check when column has a c...	Ryuta Kamizono	2013-11-26	6	-6/+62
\| * \|	Merge pull request #14359 from arthurnn/mysql2_56_franc_sec	Rafael Mendonça França	2014-03-12	5	-2/+23
\| \|\ \
\| \| * \|	Changelog entry for mysql56 microseconds	Arthur Neves	2014-03-12	1	-0/+4
\| \| * \|	Test microsecond on mysql 5.6	Arthur Neves	2014-03-12	3	-2/+11
\| \| * \|	MySQL 5.6 and later supports microsecond precision in datetime.	Tatsuhiko Miyagawa	2014-03-12	1	-0/+8
\| * \| \|	Merge pull request #14291 from laurocaetano/doc-for-original-fullpath	Yves Senn	2014-03-12	1	-0/+7
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	[ci skip] Add documentation for original_fullpath.	Lauro Caetano	2014-03-11	1	-0/+7
\| * \| \|	Merge pull request #14353 from arthurnn/remove_small_mock	Rafael Mendonça França	2014-03-11	1	-3/+1
\| \|\ \ \
\| \| * \| \|	Remove mocking on save, when not necessary	Arthur Neves	2014-03-11	1	-3/+1
\| \|/ / /
\| * \| \|	Merge pull request #14345 from arthurnn/revert_14052	Godfrey Chan	2014-03-11	2	-3/+16
\| \|\ \ \
\| \| * \| \|	Fixes STI when 2+ levels deep.	Arthur Neves	2014-03-10	2	-3/+16
\| * \| \| \|	comment why we are modifying global state. [ci skip]	Yves Senn	2014-03-11	1	-0/+1
\| * \| \| \|	`change_table` supports `citext`. Follow up to #12523.	Yves Senn	2014-03-11	2	-8/+31
\| * \| \| \|	Merge pull request #12523 from lsylvester/pg_citext	Yves Senn	2014-03-11	6	-2/+89
\| \|\ \ \ \
\| \| * \| \| \|	register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester]	lsylvester	2014-03-11	6	-2/+89
\| * \| \| \| \|	Merge pull request #14342 from zuhao/eliminate_global_state_leak_in_activemod...	Jeremy Kemper	2014-03-10	7	-110/+136
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Completely remove potential global state leaks in ActiveModel tests.	Zuhao Wan	2014-03-11	7	-110/+136
\| * \| \| \| \| \|	Merge pull request #11616 from arunagw/removed-application-command-rails	Carlos Antonio da Silva	2014-03-10	2	-6/+5
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Removed unnecessary command "application"	Arun Agrawal	2014-03-10	2	-6/+5
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #14343 from garysweaver/master	Vijay Dev	2014-03-10	1	-1/+1
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| \| * \| \| \|	minor fix to 4.1 rel notes for begin_transaction joinable option [CI skip]	Gary S. Weaver	2014-03-10	1	-1/+1
\| \|/ / / /
\| * \| \| \|	Merge pull request #8313 from alan/only_save_changed_has_one_objects	Rafael Mendonça França	2014-03-10	3	-2/+24
\| \|\ \ \ \
\| \| * \| \| \|	Save has_one associations only if record has changes	Alan Kennedy	2013-10-31	3	-2/+24
\| * \| \| \| \|	current_adapter? accepts multiple arguments	Rafael Mendonça França	2014-03-10	1	-2/+2
\| * \| \| \| \|	mysql adapter also fails with a number bigger than int	Rafael Mendonça França	2014-03-10	1	-2/+5
\| * \| \| \| \|	The 4.1 release notes is already a thing so lets show in the guides	Rafael Mendonça França	2014-03-10	1	-1/+0
\| * \| \| \| \|	Change the assertions depending in the database adapter	Rafael Mendonça França	2014-03-10	1	-14/+9
\| * \| \| \| \|	Do proper adapter check	Rafael Mendonça França	2014-03-10	1	-2/+2
\| * \| \| \| \|	Whitespaces	Rafael Mendonça França	2014-03-10	1	-2/+2
\| * \| \| \| \|	Merge pull request #14341 from keikun17/master	Yves Senn	2014-03-10	1	-2/+2
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Fix 'fields_for' doc typo.	Cakey \| Buddy Magsipoc	2014-03-10	1	-2/+2
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #14332 from tgxworld/autosave_association_test	Yves Senn	2014-03-10	1	-7/+3
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Cleanup Parrot after each test.	Guo Xiang Tan	2014-03-09	1	-7/+3
\| \|/ / / /
\| * \| \| \|	Merge pull request #14334 from kennym/master	Godfrey Chan	2014-03-09	1	-4/+8
\| \|\ \ \ \
\| \| * \| \| \|	Enhance readability of ActionView DateHelper#distance_of_time_in_words	Kenny Meyer	2014-03-09	1	-4/+8
\| \|/ / / /