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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #7137 from kennyj/fix_installing_problem_journey	Rafael Mendonça França	2012-07-23	1	-1/+1
\|\
\| *	Fix build. Bump Journey requirements to 2.0.0.	kennyj	2012-07-24	1	-1/+1
\|/
*	Bump Journey requirements to 1.0.4	Andrew White	2012-07-23	1	-1/+1
*	Add one more test case to make sure that data attributes are being	Rafael Mendonça França	2012-07-22	1	-0/+7
*	Merge pull request #7130 from kennyj/fix_restoring_query_cache	Rafael Mendonça França	2012-07-22	2	-4/+22
\|\
\| *	Restore connection_id on error.	kennyj	2012-07-23	2	-4/+22
* \|	Merge pull request #7123 from nashby/data-in-options	Rafael Mendonça França	2012-07-22	2	-8/+15
\|\ \ \| \|/ \|/\|
\| *	don't escape options in option_html_attributes method	Vasiliy Ermolovich	2012-07-22	2	-8/+15
* \|	Merge pull request #7126 from frodsan/fix_nodoc_encoding	Rafael Mendonça França	2012-07-21	1	-15/+48
\|\ \
\| * \|	fixing :nodoc:s in AS::JSON::Encoding	Francesco Rodriguez	2012-07-21	1	-15/+48
\|/ /
* \|	Remove deprecation warnings	Carlos Galdino + Rafael Mendonça França	2012-07-21	2	-2/+2
* \|	Add back `:disable_with` and change deprecation horizon to 4.1	Carlos Galdino + Rafael Mendonça França	2012-07-21	5	-5/+74
* \|	Add back `:confirm` and change deprecation horizon to 4.1	Carlos Galdino + Rafael Mendonça França	2012-07-21	5	-2/+144
* \|	+"foo"+ doesn't generate code tag [ci skip]	Rafael Mendonça França	2012-07-21	1	-1/+1
* \|	Lets be consistent with whitespaces at documentation	Rafael Mendonça França	2012-07-21	1	-13/+13
* \|	Copy-edits at Rails::Queueing documentation	Rafael Mendonça França	2012-07-21	1	-2/+2
* \|	update 4.0 release notes [ci skip]	Vijay Dev	2012-07-21	1	-0/+2
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-07-21	7	-27/+108
\|\ \
\| * \|	improve NullRelation docs [ci skip]	Vijay Dev	2012-07-21	2	-5/+4
\| * \|	minor copy edits [ci skip]	Vijay Dev	2012-07-21	2	-4/+2
\| * \|	Revert "Make it clear that you can also pass a full url to assert_routing."	Vijay Dev	2012-07-21	1	-3/+0
\| * \|	Revert "Fix a reference"	Xavier Noria	2012-07-21	1	-1/+1
\| * \|	Make it clear that you can also pass a full url to assert_routing.	Sytse Sijbrandij	2012-07-20	1	-0/+3
\| * \|	Fix typos	Oscar Del Ben	2012-07-19	1	-3/+3
\| * \|	Fix a reference	Erich Kist	2012-07-19	1	-1/+1
\| * \|	Add nodocs to delegation module and docs for merge!	Oscar Del Ben	2012-07-17	2	-1/+2
\| * \|	Update batches docs	Oscar Del Ben	2012-07-17	1	-6/+6
\| * \|	Add nodoc to HashMerger and Merger	Oscar Del Ben	2012-07-17	1	-2/+2
\| * \|	Fix typos and add nodocs to NullRelation	Oscar Del Ben	2012-07-17	2	-4/+4
\| * \|	Improve docs for AR Relation	Oscar Del Ben	2012-07-17	1	-7/+19
\| * \|	Add docs for Relation initialize, create and create!	Oscar Del Ben	2012-07-16	1	-1/+34
\| * \|	Don't link to edgeguides in docs	Oscar Del Ben	2012-07-16	1	-1/+1
\| * \|	Typo	Oscar Del Ben	2012-07-16	1	-1/+0
\| * \|	Add documentation for query_methods bang methods	Oscar Del Ben	2012-07-16	1	-1/+20
\| * \|	Add nodoc to create_with_value	Oscar Del Ben	2012-07-16	1	-1/+1
\| * \|	Add documentation for arel and build_arel	Oscar Del Ben	2012-07-16	1	-0/+2
\| * \|	Add documentation for create_with	Oscar Del Ben	2012-07-16	1	-1/+19
* \| \|	makes a pass over the API of ActiveSupport::HashWithIndifferentAccess	Xavier Noria	2012-07-21	1	-22/+70
\| \|/ \|/\|
* \|	Hash#fetch(fetch) is not the same as doing hash[key]	Xavier Noria	2012-07-21	1	-1/+11
* \|	copy-edits 9674d2c	Xavier Noria	2012-07-21	1	-2/+2
* \|	Merge pull request #7100 from shigeya/fix_mime_responds_to_doc	Xavier Noria	2012-07-20	1	-1/+2
\|\ \
\| * \|	Clarification to doc of ActionController::MimeResponse.respond_to	Shigeya Suzuki	2012-07-19	1	-1/+2
* \| \|	rm unnecessary test	Jon Leighton	2012-07-20	3	-12/+0
* \| \|	rm redundant test	Jon Leighton	2012-07-20	2	-9/+0
* \| \|	remove unused method	Jon Leighton	2012-07-20	1	-4/+0
* \| \|	remove references to :finder_sql, :counter_sql, :delete_sql, :insert_sql from...	Jon Leighton	2012-07-20	2	-55/+1
* \| \|	we don't need this arg	Jon Leighton	2012-07-20	1	-2/+2
* \| \|	Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql.	Jon Leighton	2012-07-20	15	-339/+48
* \| \|	Remove obsolete line.	Jon Leighton	2012-07-20	1	-1/+0
* \| \|	Update documentation and change the range method name to delimiter.	Rafael Mendonça França	2012-07-20	3	-5/+7