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

	Commit message (Collapse)	Author	Age	Files	Lines
*	make tests pass on Ruby 2.2	Aaron Patterson	2014-03-13	2	-5/+5
\| \| \| \| \| \|	Apparently we've been using a buggy feature for the past 6 years: https://bugs.ruby-lang.org/issues/9593
*	Use Sqlite3 adapter in examples	Julian Simioni	2014-03-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Two bits of example code use sqlite as an adapter, which doesn't exist. Using the code verbatim will raise a LoadError exception: ActiveRecord::Base.establish_connection( "adapter" => "sqlite", "database" => "db.sqlite" ) # => LoadError: Could not load 'active_record/connection_adapters/sqlite_adapter'... Considering this is code a lot of people new to Rails might be running, it's especially confusing. Closes #14367 [ci skip]
*	use the body proxy to freeze headers	Aaron Patterson	2014-03-12	5	-12/+57
\| \| \| \| \| \|	avoid freezing the headers until the web server has actually read data from the body proxy. Once the webserver has read data, then we should throw an error if someone tries to set a header
*	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
\| \| \| \| \| \| \| \| \| \| \|	when streaming responses, we need to make sure the cookie jar is written to the headers before returning up the stack. This commit introduces a new method on the response object that writes the cookie jar to the headers as the response is committed. The middleware and test framework will not write the cookie headers if the response has already been committed. fixes #14352
*	Merge pull request #14366 from sukolsak/grammar	Lauro Caetano	2014-03-12	1	-1/+1
\|\ \| \| \| \|	Fix a grammatical error in the i18n guide
\| *	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 [skip ci]
\| *	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
\|\ \ \| \|/ \|/\|	Add more tests for mysql 5.6 microseconds + Fix tests
\| *	Change usec to 0 on tests that compare seconds	Arthur Neves	2014-03-12	1	-3/+3
\| \| \| \| \| \| \| \| \| \|	Avoid rounding problems with `.usec` method rounding the seconds when the field doesn't persist the `.usec` piece.
\| *	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 case insensitive collation. Conflicts: activerecord/CHANGELOG.md
\| *	Only use BINARY for mysql case sensitive uniqueness check when column has a ↵	Ryuta Kamizono	2013-11-26	6	-6/+62
\| \| \| \| \| \| \| \|	case insensitive collation.
* \|	Merge pull request #14359 from arthurnn/mysql2_56_franc_sec	Rafael Mendonça França	2014-03-12	5	-2/+23
\|\ \ \| \| \| \| \| \|	MySQL 5.6 Fractional Seconds
\| * \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	You might want to branch it to include this only for 5.6, but passing these values to < 5.6 doesn't cause issues either.
* \| \|	Merge pull request #14291 from laurocaetano/doc-for-original-fullpath	Yves Senn	2014-03-12	1	-0/+7
\|\ \ \ \| \|/ / \|/\| \|	Add documentation for original_fullpath. [ci skip]
\| * \|	[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
\| * \| \|	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.
\| * \| \|	Fixes STI when 2+ levels deep.	Arthur Neves	2014-03-10	2	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PR #14052 Added a regression where it was only looking for methods in one level up, So when the method was defined in a 2+ levels up the inheritance chain, the method was not found as defined.
* \| \| \|	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
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Support for PostgreSQL citext data type.
\| * \| \| \|	register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester]	lsylvester	2014-03-11	6	-2/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	citext makes it possible to use AR Hash finders for case-insensitive matching as sql UPPER/LOWER functions are not needed.
* \| \| \| \|	Merge pull request #14342 from ↵	Jeremy Kemper	2014-03-10	7	-110/+136
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	zuhao/eliminate_global_state_leak_in_activemodel_tests Eliminate global state leaks completely in ActiveModel tests
\| * \| \| \| \|	Completely remove potential global state leaks in ActiveModel tests.	Zuhao Wan	2014-03-11	7	-110/+136
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveModel tests can now be run in random order.
* \| \| \| \| \|	Merge pull request #11616 from arunagw/removed-application-command-rails	Carlos Antonio da Silva	2014-03-10	2	-6/+5
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Removed command "application"
\| * \| \| \| \|	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
\| * \| \| \|	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 Conflicts: activerecord/CHANGELOG.md
\| * \| \| \|	Save has_one associations only if record has changes	Alan Kennedy	2013-10-31	3	-2/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevents save related callbacks such as `after_commit` being triggered when `has_one` objects are already persisted and have no changes.
* \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	links
* \| \| \| \|	Change the assertions depending in the database adapter	Rafael Mendonça França	2014-03-10	1	-14/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will avoid the confusing flunk logic
* \| \| \| \|	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 minor typo 'fields_for'. [ci skip]
\| * \| \| \| \|	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
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Delete instances of Parrot after each test.
\| * \| \| \|	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
\| * \| \| \|	Enhance readability of ActionView DateHelper#distance_of_time_in_words	Kenny Meyer	2014-03-09	1	-4/+8
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor numerical constants to module constants which give the numbers a contextual meaning. This commit aims to provide quicker understanding for part of the implementation of the DateHelper#distance_of_time_in_words method.
* \| \| \|	Merge pull request #14315 from zuhao/activemodel_tests_in_random_order	Yves Senn	2014-03-09	4	-13/+39
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Run ActiveModel test suites in random order.