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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\| *	Update performance profiler to work with latest ruby-prof	Arun Agrawal	2012-05-11	2	-2/+2
\|/
*	Return false for exists? with new records - fixes #6199.	Andrew White	2012-05-10	3	-2/+3
*	Don't ignore nil positional arguments for url helpers - fixes #6196.	Andrew White	2012-05-10	2	-1/+35
*	Refactor the handling of default_url_options in integration tests	Andrew White	2012-05-10	2	-7/+104
*	Merge pull request #6230 from spectator/active_resource_exceptions	Jeremy Kemper	2012-05-10	2	-1/+1
\|\
\| *	Make sure TimeoutError is loaded.	Yury Velikanau	2012-05-10	2	-1/+1
* \|	Merge pull request #6221 from alexeymuranov/deprecate__instantiate_fixtures__...	Jeremy Kemper	2012-05-09	1	-7/+26
\|\ \
\| * \|	Remove deprecated use of ::instantiate_fixtures	Alexey Muranov	2012-05-10	1	-4/+4
\| * \|	Deprecate ::instantiate_fixtures unused parameter	Alexey Muranov	2012-05-10	1	-3/+22
* \| \|	Merge pull request #6149 from jmbejar/javascript_include_tag_with_not_duplicates	Santiago Pastorino	2012-05-09	2	-2/+8
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Make sure that javascript_include_tag/stylesheet_link_tag methods in	Jorge Bejar	2012-05-03	2	-2/+8
* \| \|	Merge pull request #6219 from frodsan/fix_build	Piotr Sarnacki	2012-05-09	1	-1/+9
\|\ \ \
\| * \| \|	Fix build	Francesco Rodriguez	2012-05-09	1	-1/+9
* \| \| \|	Merge pull request #6228 from mjtko/changelog-fixes-for-3-2-stable	Vijay Dev	2012-05-09	1	-1/+65
\|\ \ \ \
\| * \| \| \|	Add CHANGELOG section for unreleased Rails 3.2.4; document addition of #begin...	Mark J. Titorenko	2012-05-09	1	-0/+6
\| * \| \| \|	Bring activesupport CHANGELOG up-to-date/consistent with master.	Mark J. Titorenko	2012-05-09	1	-1/+59
\|/ / / /
* \| \| \|	Merge pull request #6223 from carlosantoniodasilva/remove-columns-deprecation...	Andrew White	2012-05-09	2	-4/+6
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Stop showing deprecations for Ruby 1.8.7 with remove_column	Carlos Antonio da Silva	2012-05-09	2	-4/+6
\|/ / /
* \| \|	Merge pull request #6218 from frodsan/fix_docs_32stable	Vijay Dev	2012-05-09	1	-11/+11
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	fix attribute_accessors docs to support 1.8 syntax	Francesco Rodriguez	2012-05-09	1	-11/+11
\|/ /
* \|	Merge pull request #6213 from frodsan/cut_docs_dup	Vijay Dev	2012-05-08	1	-23/+0
\|\ \
\| * \|	removing docs duplication	Francesco Rodriguez	2012-05-08	1	-23/+0
\|/ /
* \|	Merge pull request #6211 from frodsan/docs_attr_accessor_32stable	Vijay Dev	2012-05-08	1	-0/+111
\|\ \
\| * \|	added docs to attribute_accessors methods	Francesco Rodriguez	2012-05-08	1	-0/+111
\| \|/
* \|	Merge pull request #6200 from arunagw/3-2-stable	Santiago Pastorino	2012-05-08	1	-1/+1
\|\ \
\| * \|	locking ruby-prof until we got a fix	Arun Agrawal	2012-05-08	1	-1/+1
* \| \|	Merge pull request #6198 from whistlerbrk/3-2-stable	José Valim	2012-05-07	2	-1/+23
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	If content_type is explicitly passed to the :head method use the value or fal...	Kunal Shah	2012-05-07	1	-1/+2
\| * \|	Add failing test re #3436 which demonstrates content_type is not respected wh...	Kunal Shah	2012-05-07	1	-0/+21
\|/ /
* \|	Merge pull request #6170 from mjtko/feature-beginning_of_hour-for-3-2-stable	Jeremy Kemper	2012-05-05	5	-0/+56
\|\ \
\| * \|	added beginning_of_hour support to core_ext calculations for Time and DateTime	Mark J. Titorenko	2012-05-04	5	-0/+56
\| \|/
* \|	Give more detailed instructions in script/rails in engine	Piotr Sarnacki	2012-05-04	1	-0/+4
* \|	Merge pull request #6128 from frodsan/delete_all_limit_32	Aaron Patterson	2012-05-04	2	-0/+6
\|\ \
\| * \|	Fix #4979 against 3-2-stable - delete_all raise an error if a limit is provided	Francesco Rodriguez	2012-05-02	2	-0/+6
* \| \|	Merge pull request #4445 from nragaz/role_based_params_wrapping	José Valim	2012-05-04	2	-4/+18
\|\ \ \
\| * \| \|	Add a role option to wrap_parameters.	Nick Ragaz	2012-05-04	2	-4/+18
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #6158 from Dagnan/3-2-stable	Vijay Dev	2012-05-04	1	-8/+10
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	improvements in "caching_with_rails" guide - backported from docrails	kucaahbe	2012-05-04	1	-8/+10
\|/ /