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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \|	Merge pull request #6324 from acapilleri/dup_validation_3_2	Rafael Mendonça França	2012-05-15	2	-0/+21
\|\ \
\| * \|	clean the errors if an object that includes validations errors is duped,for 3...	Angelo capilleri	2012-05-15	2	-0/+21
\|/ /
* \|	Merge pull request #6321 from frodsan/backport_docs	Vijay Dev	2012-05-15	3	-4/+23
\|\ \
\| * \|	Backporting some docs on core_ext/hash	Francesco Rodriguez	2012-05-15	3	-4/+23
\|/ /
* \|	Deprecate `:disable_with` for `button_tag` too	Carlos Galdino + Rafael Mendonça França	2012-05-14	5	-9/+20
* \|	Fix typo	Carlos Galdino + Rafael Mendonça França	2012-05-14	3	-10/+10
* \|	Deprecate `:disable_with` in favor of `'data-disable-with'` option for `butto...	Carlos Galdino + Rafael Mendonça França	2012-05-14	5	-31/+54
* \|	Merge pull request #6018 from lest/patch-1	Carlos Antonio da Silva	2012-05-14	3	-1/+16
* \|	Default escape_html_entities_in_json to true in new apps	José Valim	2012-05-14	1	-2/+2
* \|	Update railties/lib/rails/generators/rails/app/templates/config/application.rb	Egor Homakov	2012-05-14	1	-0/+3
* \|	Merge pull request #6266 from alexeymuranov/remove_unused_private_method	Carlos Antonio da Silva	2012-05-13	1	-3/+0
\|\ \
\| * \|	Remove unused private method yaml_fixtures_key	Alexey Muranov	2012-05-11	1	-3/+0
* \| \|	Deprecate `:mouseover` options for `image_tag` helper.	Rafael Mendonça França	2012-05-13	3	-8/+44
* \| \|	Merge pull request #3237 from sakuro/data-url-scheme	Rafael Mendonça França	2012-05-13	3	-3/+4
* \| \|	Merge pull request #6306 from erichmenge/3-2-stable-guide-fix	Carlos Antonio da Silva	2012-05-13	1	-2/+2
\|\ \ \
\| * \| \|	:foreign_key option should be on has_many side of association	Mikhail Dieterle	2012-05-13	1	-2/+2
* \| \| \|	Merge pull request #6299 from guilleiguaran/upgrade-sprockets-3-2-stable	Santiago Pastorino	2012-05-13	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Upgrade sprockets to 2.1.3	Guillermo Iguaran	2012-05-13	1	-1/+1
\|/ / /
* \| \|	Merge pull request #6294 from frodsan/docs_backport	Vijay Dev	2012-05-12	3	-1/+22
\|\ \ \
\| * \| \|	adding examples and docs	Francesco Rodriguez	2012-05-12	3	-1/+22
\|/ / /
* \| \|	Merge pull request #6292 from erichmenge/3-2-stable-docfix	Rafael Mendonça França	2012-05-12	1	-1/+16
\|\ \ \
\| * \| \|	Update 'getting started' guides for new whitelist security implementation. Cl...	Erich Menge	2012-05-12	1	-1/+16
\|/ / /
* \| \|	Merge pull request #6262 from arunagw/ruby_prof_fix	Santiago Pastorino	2012-05-11	2	-2/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Ruby-Prof works with ruby-1.9.3 also.	Arun Agrawal	2012-05-11	1	-1/+1