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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:lifo/docrails	Michael Lavrisha	2011-07-24	1	-29/+76
\|\
\| *	Wrapped text content to 120 chars	Jason Noble & Ralph Shnelvar	2011-07-24	1	-30/+79
* \|	Rewrite apart of the REST section to be in the present tense	Michael Lavrisha	2011-07-24	1	-2/+2
\|/
*	Provide consistant indentation for the example code	Michael Lavrisha	2011-07-24	1	-8/+8
*	Fix example code for #validates_with instance method	Ben Marini	2011-07-24	1	-2/+2
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-07-24	28	-58/+66
\|\
\| *	little details seen while reviewing	Xavier Noria	2011-07-24	1	-2/+2
\| *	Moved ActionController, ActionView and ActionDispatch sections under ActionPack	Jason Noble & Ralph Shnelvar	2011-07-24	1	-3/+3
\| *	Add link to the Layouts and Rendering guide to explain more on view templates	Jason Noble & Ralph Shnelvar	2011-07-24	1	-1/+3
\| *	Modified the content based on vijaydev's comment	Jason Noble & Ralph Shnelvar	2011-07-24	1	-1/+1
\| *	Update guide to be based on Rails 3.1.	Jason Noble & Ralph Shnelvar	2011-07-24	1	-1/+1
\| *	Added link to the RubyGems User's Guide	Jason Noble & Ralph Shnelvar	2011-07-24	1	-0/+1
\| *	Added explanation to Components of Rails to help users not get hung up on det...	Jason Noble & Ralph Shnelvar	2011-07-24	1	-1/+2
\| *	Merge branch 'master' of https://github.com/lifo/docrails	Ken Ip	2011-07-24	1	-5/+5
\| \|\
\| \| *	Added some context for rack apps, linked to the Rails on Rack guide.	Jason Noble & Ralph Shnelvar	2011-07-24	1	-1/+1
\| \| *	Clarified notes in 3.2 Creating the Blog Application	Mike Howard	2011-07-24	1	-3/+3
\| \| *	Changed wording of paragraph 2.1.1 Models to clarify table/model	Mike Howard	2011-07-24	1	-1/+1
\| * \|	Update "Getting Started" for Rails 3.1	Ken Ip	2011-07-24	1	-2/+6
\| \|/
\| *	Revert "Tests now require MySQL2 adapter in order to run"	Xavier Noria	2011-07-24	1	-2/+11
\| *	Missed a few instances of British English spelling in the last commit	Oemuer Oezkir	2011-07-24	3	-3/+3
\| *	Changed a few instances of of words in the API docs written in British Englis...	Oemuer Oezkir	2011-07-24	15	-26/+26
\| *	Changing Textile emphasis underscores to em tags; the link with underscores t...	Carol Nichols	2011-07-23	1	-1/+1
\| *	Changed several instances of British English to be American English	Evan Farrar	2011-07-23	8	-10/+10
\| *	Replaced ‘ with ' in the guides.	Evan Farrar	2011-07-23	2	-7/+7
\| *	Tests now require MySQL2 adapter in order to run	Joe Fiorini	2011-07-23	1	-11/+2
\| *	now the documentation reflects the actual returned value for a missing transl...	gnagno	2011-07-23	1	-1/+1
* \|	Merge pull request #1186 from mitijain123/duplicable_test	Santiago Pastorino	2011-07-24	1	-7/+12
\|\ \
\| * \|	Duplicable test is looking fine now.	Mitesh Jain	2011-07-24	1	-7/+12
\|/ /
* \|	Merge pull request #2239 from castlerock/scaffold_jquery	Santiago Pastorino	2011-07-24	1	-0/+1
\|\ \
\| * \|	Bringing back the jquery-rails. One test is dependent.	Mitesh Jain	2011-07-24	1	-0/+1
\|/ /
* \|	Merge pull request #2233 from gramos/fix-issue-1951-master	Aaron Patterson	2011-07-23	2	-2/+30
\|\ \
\| * \|	- added ActionView::PartialRenderer#merge_path_into_partial(path, partial)	Gaston Ramos	2011-07-24	2	-3/+17
\| * \|	- added test case for issue:	Gaston Ramos	2011-07-24	1	-0/+14
* \| \|	just use normal ruby for stubbing	Aaron Patterson	2011-07-23	1	-5/+3
\|/ /
* \|	Merge pull request #2185 from castlerock/lazy_load_abstract_adapter	Aaron Patterson	2011-07-23	2	-3/+2
\|\ \
\| * \|	lazy load ConnectionAdapters remove require.	Vishnu Atrai	2011-07-22	2	-3/+2
* \| \|	Merge pull request #2228 from Empact/helper_tags_in_mailers	Aaron Patterson	2011-07-23	2	-1/+2
\|\ \ \
\| * \| \|	Simple fix to the NoMethodError noted in #2177.	Ben Woosley	2011-07-23	2	-1/+2
* \| \| \|	simplify singleton_class? method	Aaron Patterson	2011-07-23	1	-7/+1
* \| \| \|	Merge pull request #2226 from dmathieu/perform_caching	Aaron Patterson	2011-07-23	1	-0/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	rake assets:precompile should always perform caching - Closes #2199	Damien Mathieu	2011-07-24	1	-0/+1
\|/ / /
* \| \|	Remove unused gems from Gemfile	Santiago Pastorino	2011-07-23	1	-4/+0
* \| \|	Merge pull request #2221 from grzuy/master	Santiago Pastorino	2011-07-23	2	-1/+8
\|\ \ \
\| * \| \|	Fix ActiveSupport::Cache::FileStore#file_path_key does not work if initialize...	Gonzalo Rodriguez	2011-07-23	2	-1/+8
\|/ / /
* \| \|	Merge pull request #2218 from guilleiguaran/avoid-map-chaining	Aaron Patterson	2011-07-23	1	-1/+1
\|\ \ \
\| * \| \|	Remove unneccesary map chaining	Guillermo Iguaran	2011-07-23	1	-1/+1
\|/ / /
* \| \|	Merge pull request #2217 from marcandre/fix_enumerable	Aaron Patterson	2011-07-23	2	-32/+74
\|\ \ \
\| * \| \|	Trivial optimization for Enumerable#each_with_object	Marc-Andre Lafortune	2011-07-23	1	-2/+2
\| * \| \|	Insure that Enumerable#index_by, group_by, ... return Enumerators	Marc-Andre Lafortune	2011-07-23	2	-1/+15
\| * \| \|	Make Enumerable#many? iterate only over what is necessary	Marc-Andre Lafortune	2011-07-23	2	-3/+17