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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \|	Merge pull request #7651 from steveklabnik/issue_3956	Rafael Mendonça França	2012-09-16	2	-2/+32
* \|	Backport explain fixes.	Rafael Mendonça França	2012-09-16	5	-13/+27
* \|	`skip` in Ruby 1.8 doesn't skip the test case without return	Rafael Mendonça França	2012-09-13	1	-1/+1
* \|	Merge pull request #7633 from frodsan/patch-5	Carlos Antonio da Silva	2012-09-13	1	-1/+1
\|\ \
\| * \|	fix markdown markup in AR/CHANGELOG	Francesco Rodríguez	2012-09-13	1	-1/+1
\|/ /
* \|	Merge pull request #7632 from stevecj/3-2-stable	Rafael Mendonça França	2012-09-13	4	-0/+82
\|\ \
\| * \|	Backport PostgreSQL auto-reconnect test coverage	Steve Jorgensen	2012-09-13	4	-0/+82
\|/ /
* \|	Merge pull request #7603 from kennyj/fix_charset_vs_encoding_32	Rafael Mendonça França	2012-09-12	2	-3/+9
\|\ \
\| * \|	Backported #7572 to 3-2-stable. Use config['encoding'], because database conf...	kennyj	2012-09-12	2	-3/+9
\|/ /
* \|	Merge pull request #7582 from tchandy/fix_type_cast_code	Rafael Mendonça França	2012-09-09	4	-2/+36
\|\ \
\| * \|	ConnectionAdapters::Column.type_cast_code should always convert values to int...	Thiago Pradi	2012-09-09	4	-2/+36
* \| \|	Fix AS tests due to builder change with nil values / empty strings	Carlos Antonio da Silva	2012-09-07	1	-2/+2
* \| \|	Fix AR tests due to builder change with nil values / empty strings	Carlos Antonio da Silva	2012-09-07	1	-6/+6
* \| \|	Update Active Model xml serialization test to reflect a change in builder	Carlos Antonio da Silva	2012-09-07	2	-1/+14
* \| \|	Merge pull request #7337 from adzap/string_to_dummy_time	Rafael Mendonça França	2012-09-05	3	-1/+23
\| \|/ \|/\|
* \|	Merge pull request #7514 from senny/issue_7503_3_2_stable	Rafael Mendonça França	2012-09-03	6	-2/+42
\|\ \ \| \|/ \|/\|
\| *	set the configured #inheritance_column on #become (#7503)	Yves Senn	2012-09-03	6	-2/+42
\|/
*	documents after_(commit\|rollback)	Xavier Noria	2012-08-30	1	-0/+18
*	Merge pull request #7474 from steveklabnik/backport_89ebd28	Piotr Sarnacki	2012-08-29	2	-1/+8
\|\
\| *	Fix bug when Rails.application is defined but is nil. See #881	Marc-Andre Lafortune	2012-08-28	2	-1/+8
\|/
*	Ensure association preloading properly merges default scope and association c...	Pratik Naik	2012-08-28	4	-3/+25
*	CHANGELOGs are now per branch	Xavier Noria	2012-08-28	6	-16740/+6
*	fixes a bug in dependencies.rb	Xavier Noria	2012-08-28	1	-1/+1
*	Merge pull request #7446 from nashby/backport-fix-issue-7431	Rafael Mendonça França	2012-08-25	3	-2/+34
\|\
\| *	correct handling of date selects when using both disabled and discard options	Vasiliy Ermolovich	2012-08-25	3	-2/+34
\|/
*	Merge pull request #7438 from arunagw/3-2-stable-edge-rails-fix	Santiago Pastorino	2012-08-24	2	-3/+4
\|\
\| *	We need to have 1-0-stable for joureny gem in edge	Arun Agrawal	2012-08-24	2	-3/+4
\|/
*	Use Ruby 1.8 hash syntax	Carlos Antonio da Silva	2012-08-21	2	-3/+3
*	Use a model without counter cache to test read-only attributes	Rafael Mendonça França	2012-08-21	1	-9/+10
*	Merge pull request #5210 from Pliny/masteri	Rafael Mendonça França	2012-08-21	8	-2/+36
*	Merge pull request #7410 from sandeepravi/default_options_helper_value	Rafael Mendonça França	2012-08-21	3	-0/+18
*	Merge pull request #6986 from kennyj/fix_6975	Rafael Mendonça França	2012-08-21	3	-5/+34
*	Merge pull request #7377 from brainopia/use_inversed_parent_for_first_and_las...	Carlos Antonio da Silva	2012-08-21	3	-1/+11
*	Merge pull request #7388 from ManageIQ/fix_table_remove_passing_array_depreca...	Rafael Mendonça França	2012-08-18	2	-3/+3
\|\
\| *	Table#remove passed an array to remove_column, which is deprecated.	Joe Rafaniello	2012-08-18	2	-3/+3
* \|	Ruby 1.8 doesn't have to_r defined to NilClass and Float.	Rafael Mendonça França	2012-08-18	1	-5/+14
\|/
*	Merge pull request #7352 from aripollak/microsecond-timestamp	Rafael Mendonça França	2012-08-17	4	-3/+10
*	Increase benchmark time to 20 seconds.	Jon Leighton	2012-08-17	1	-18/+18
*	Use benchmark/ips to measure AR performance	Jon Leighton	2012-08-17	2	-39/+36
*	Remove duplicated changelog entry [ci skip]	Carlos Antonio da Silva	2012-08-15	1	-6/+0
*	Merge pull request #7027 from erichmenge/patch/jruby_send_file	Carlos Antonio da Silva	2012-08-15	2	-2/+28
\|\
\| *	Backport 5c51cd0: #send_file leans on Rack::Sendfile to X-Accel-Redirect the ...	Jeremy Kemper	2012-08-15	2	-2/+28
* \|	Do not use update_column where update_attribute is not interchangeable	Rafael Mendonça França	2012-08-15	8	-39/+32
\|/
*	Merge pull request #6073 from daveyeu/restore-state-on-record-invalid	Rafael Mendonça França	2012-08-11	3	-1/+23
*	Merge pull request #7316 from brainopia/backport_fix_session_store_options	Rafael Mendonça França	2012-08-11	5	-5/+38
\|\
\| *	Update changelog to reflect support of cookie jar options for all	brainopia	2012-08-11	1	-0/+5
\| *	Test actual content of permanent cookie	brainopia	2012-08-10	1	-1/+1
\| *	Dont stream back cookie value if it was set to the same value	brainopia	2012-08-10	2	-5/+19
\| *	Revert "Revert "Merge pull request #6084 from brainopia/support_for_magic_dom...	brainopia	2012-08-10	2	-0/+14
* \|	[guides] Add info about CHANGELOGs to contributing guide	Piotr Sarnacki	2012-08-11	1	-0/+25