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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \|	Merge pull request #5810 from kennyj/fix_5797	Aaron Patterson	2012-05-30	4	-5/+15
\|/ /
* \|	Merge pull request #6519 from oscardelben/3-2-stable	Carlos Antonio da Silva	2012-05-29	2	-7/+11
\|\ \
\| * \|	Remove irrelevant assertion	Oscar Del Ben	2012-05-29	1	-7/+0
\| * \|	Display annotations from .coffee files in `rake notes`	Bartlomiej Kozal	2012-05-28	2	-7/+18
\| \|/
* \|	Merge pull request #6531 from freerange/3-2-stable-minitest-passthrough-excep...	Rafael Mendonça França	2012-05-29	2	-2/+47
\|\ \ \| \|/ \|/\|
\| *	Exceptions like Interrupt should not be rescued in tests.	James Mead	2012-05-29	2	-2/+47
\|/
*	Fix railties_order when application object is passed	Piotr Sarnacki	2012-05-27	2	-1/+5
*	Merge pull request #6494 from pwim/no-memcache-require	José Valim	2012-05-27	1	-1/+0
\|\
\| *	remove unnecessary memcache equire in ActionDispatch::Session::CacheStore	Brian Durand	2012-05-26	1	-1/+0
\|/
*	Merge pull request #5244 from fotos/myqsl2_wait_timeout	Rafael Mendonça França	2012-05-25	1	-1/+1
*	Merge pull request #5925 from Juanmcuello/pg_structure_dump	Carlos Antonio da Silva	2012-05-24	1	-2/+2
\|\
\| *	Use Shellwords to scape arguments in db:structure:dump for PostgreSQL.	Juan M. Cuello	2012-05-22	1	-2/+2
* \|	Merge pull request #6467 from aselder/3-2-stable	Aaron Patterson	2012-05-23	1	-10/+12
\|\ \ \| \|/ \|/\|
\| *	Synchronize the ConnectionPool#release method to avoid thread safety issues [...	Andrew Selder	2012-05-23	1	-10/+12
\|/
*	Merge pull request #6451 from chancancode/3-2-stable_restore_frozen_state_on_...	Rafael Mendonça França	2012-05-22	1	-2/+4
\|\
\| *	Fixes the build break caused by 9ee8528 in #6445.	Godfrey Chan	2012-05-22	1	-2/+4
\|/
*	Merge pull request #6445 from chancancode/3-2-stable_restore_frozen_state_on_...	Rafael Mendonça França	2012-05-22	2	-1/+13
\|\
\| *	Restore the frozen state on rollback. Fixes #6417.	Godfrey Chan	2012-05-22	2	-1/+13
\|/
*	Use require_dependency in generated controllers	Piotr Sarnacki	2012-05-22	3	-4/+4
*	Merge pull request #6418 from pwnall/pgsql_bytea_limit3	Aaron Patterson	2012-05-21	2	-8/+20
\|\
\| *	Postgresql doesn't accept limits on binary (bytea) columns.	Victor Costan	2012-05-21	2	-8/+20
* \|	Merge pull request #6423 from lest/patch-2	Carlos Antonio da Silva	2012-05-21	3	-2/+10
\|\ \
\| * \|	Assets: don't add extension if other given and file exists	Sergey Nartimov	2012-05-21	3	-2/+10
\|/ /
* /	More info on commit messages in contributing guide	Piotr Sarnacki	2012-05-21	1	-1/+33
\|/
*	Fix generators to help with ambiguous `ApplicationController` issue	Piotr Sarnacki	2012-05-20	4	-5/+24
*	Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stable	Rafael Mendonça França	2012-05-20	2	-3/+3
\|\
\| *	Fixed tag_helper data-attribute bug with BigDecimals	Bodacious	2012-05-20	2	-3/+3
* \|	Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614c	José Valim	2012-05-20	1	-10/+22
\|\ \ \| \|/ \|/\|
\| *	Prevent concurrent compilation of templates - closes #6400	Tom Clarke	2012-05-20	1	-10/+22
* \|	Improve docs for `try` by adding note on `BasicObject`	Piotr Sarnacki	2012-05-20	1	-0/+4
* \|	Fix uniqueness validator with `allow_nil: false` also for mysql	Piotr Sarnacki	2012-05-19	1	-1/+1
* \|	Fix `validates_uniqueness_off :field, :allow_nil => false`	Piotr Sarnacki	2012-05-19	2	-2/+13
* \|	Use right option for excerpt text helper in tests, fix build	Carlos Antonio da Silva	2012-05-19	2	-10/+10
* \|	Merge pull request #6398 from pmahoney/threadsafe-connection-pool	Aaron Patterson	2012-05-19	1	-4/+8
* \|	Ensure that CollectionAssociation#replace returns proper target	Piotr Sarnacki	2012-05-19	2	-3/+3
* \|	Merge pull request #5020 from KL-7/fix-blank-image_tag-source	José Valim	2012-05-18	2	-2/+3
* \|	Merge pull request #6390 from ernie/invalid-ruby18-syntax-in-habtm	Rafael Mendonça França	2012-05-18	1	-2/+2
\|\ \
\| * \|	Fix HABTM syntax error in Ruby 1.8.x	Ernie Miller	2012-05-18	1	-2/+2
\|/ /
* \|	fix #delete_all with habtm with :delete_sql	Jon Leighton	2012-05-18	2	-0/+7
* \|	Perf: Don't load the association for #delete_all.	Jon Leighton	2012-05-18	6	-9/+48
* \|	Merge pull request #6377 from ihid/depreciate_old_text_helper_apis	Rafael Mendonça França	2012-05-18	3	-36/+56
\|\ \
\| * \|	Deprecate old APIs for highlight, excerpt and word_wrap	Jeremy Walker	2012-05-18	3	-36/+56
\|/ /
* \|	Merge pull request #6367 from frodsan/fix_validators_docs	Vijay Dev	2012-05-17	9	-116/+154
\|\ \
\| * \|	fix validations docs	Francesco Rodriguez	2012-05-17	9	-116/+154
\|/ /
* \|	Fix CollectionAssociation#replace to return new target (closes #6231)	Piotr Sarnacki	2012-05-16	2	-0/+14
* \|	Merge pull request #6340 from bcardarella/patch-3	Aaron Patterson	2012-05-16	1	-1/+1
\|\ \
\| * \|	Changing the indentation level of the block comment close for SASS	Brian Cardarella	2012-05-15	1	-1/+1
\|/ /
* \|	Merge pull request #6329 from acapilleri/backport_dup_validation_3_2	Rafael Mendonça França	2012-05-15	1	-1/+9
\|\ \
\| * \|	add backport for the pull request #6324	Angelo Capilleri	2012-05-15	1	-1/+9
\|/ /
* \|	Fix indent from previous merge	Carlos Antonio da Silva	2012-05-15	1	-2/+2