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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-06-18	1	-1/+1
\|\
\| *	fixed typo for a methodname	thoefer	2011-06-11	1	-1/+1
* \|	Attributes on scaffold and model generators default to string.	José Valim	2011-06-17	1	-1/+1
* \|	Patch for #1458 - [3.1.0.rc1] App plugins initialized before engines	Joseph Wong	2011-06-16	1	-1/+1
* \|	Make the API for compression consistent between JS and CSS. By default, user...	wycats	2011-06-16	1	-3/+0
* \|	Merge pull request #1733 from SAP-Oxygen/master-plugins_in_engine_patch	José Valim	2011-06-16	2	-8/+10
\|\ \
\| * \|	Cherry-picking patch for https://github.com/rails/rails/issues/1460	Joseph Wong	2011-06-16	2	-8/+10
* \| \|	replace dev.ror.com plugin url with a dummy one	Vijay Dev	2011-06-16	1	-2/+2
* \| \|	Improve the legacy wild controller route in app templates	Wen-Tien Chang	2011-06-16	1	-1/+1
\|/ /
* \|	load_generators from engine should also handle self automatically.	José Valim	2011-06-15	1	-3/+3
* \|	namespace engine assets	Ryan Bates	2011-06-12	2	-7/+21
* \|	s/Bundle/Bundler/	Xavier Noria	2011-06-11	1	-1/+1
\|/
*	shell out to run bundler on app generation, see rationale in the comment	Xavier Noria	2011-06-10	1	-6/+12
*	make 'rails runner' show usage when run without any options	Vijay Dev	2011-06-10	1	-0/+4
*	Merge pull request #1356 from flippingbits/fix_engine_generator	José Valim	2011-06-09	10	-23/+69
\|\
\| *	Use mattr_accessor :namespace	Stefan Sprenger	2011-06-07	1	-10/+2
\| *	Use namespace if it's a mountable engine	Stefan Sprenger	2011-06-07	4	-3/+17
\| *	We moved engine commands to rails/engine/commands	Stefan Sprenger	2011-05-27	1	-5/+1
\| *	Add destroy to engine's commands	Stefan Sprenger	2011-05-27	1	-2/+3
\| *	Generate script/rails only if --full is given	Stefan Sprenger	2011-05-27	1	-0/+2
\| *	Refactor identifying generator's destination root	Stefan Sprenger	2011-05-27	1	-5/+2
\| *	Move requiring engine out of the switch case	Stefan Sprenger	2011-05-27	1	-4/+3
\| *	Fix and test ENGINE_PATH and ENGINE_ROOT	Stefan Sprenger	2011-05-27	1	-2/+2
\| *	Introducing engine commands	Stefan Sprenger	2011-05-26	3	-3/+48
\| *	Move load_generators from Rails::Application to Rails::Engine	Stefan Sprenger	2011-05-26	2	-12/+12
* \|	sprockets gzips assets now	Xavier Noria	2011-06-07	1	-1/+4
* \|	Fixing Rails::Server#app under Rack::URLMap	Guillermo Iguaran	2011-06-07	2	-1/+5
* \|	adds missing require	Xavier Noria	2011-06-07	1	-0/+2
* \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-06-06	7	-12/+12
\|\ \
\| * \|	Remove trailing white-spaces	Guillermo Iguaran	2011-06-05	5	-9/+9
\| * \|	fix incorrect module name for wrap parameters	Vijay Dev	2011-06-04	1	-1/+1
\| * \|	Upcoming version of Rails is upon us so no need to refer to it. [API DOCS]	Rohit Arondekar	2011-06-03	1	-2/+2
\| * \|	add alias info for runner command	Vijay Dev	2011-06-02	1	-1/+1
* \| \|	revises commit from pull request 1408	Xavier Noria	2011-05-31	1	-4/+7
* \| \|	revises commit from pull request 1409	Xavier Noria	2011-05-31	1	-4/+8
* \| \|	Modified generated text to explain where .js and .coffee files can be located...	Noel Gomez	2011-05-31	1	-3/+5
* \| \|	changed text to be more explicit about where stylesheets can be located	Noel Gomez	2011-05-31	1	-2/+5
* \| \|	Merge pull request #1404 from commuter/plugin_new_generator_should_properly_r...	José Valim	2011-05-30	2	-1/+5
\|\ \ \
\| * \| \|	properly require javascript libraries when generating mountable engine	J. Edward Dewyea	2011-05-30	2	-1/+5
\| \| \|/ \| \|/\|
* \| \|	refectored assets:clean task	Vishnu Atrai	2011-05-30	1	-3/+1
* \| \|	rename task and Rake::FileList used	Vishnu Atrai	2011-05-27	1	-3/+3
* \| \|	Add rake task to implement assets:cleanup, fixes Github Issues # 1284	Bhavin Kamani	2011-05-27	1	-0/+10
\|/ /
* \|	Use global namespace Rails	Stefan Sprenger	2011-05-26	1	-1/+1
* \|	Use plugin name consistently	Stefan Sprenger	2011-05-26	1	-1/+1
* \|	Added a space to the comment_if helper for formatting purposes	Andrew Davis	2011-05-25	1	-1/+1
* \|	Removed unnecessary space in application.rb for formatting	Andrew Davis	2011-05-25	1	-1/+1
\|/
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-05-25	3	-6/+6
\|\
\| *	Removed extra white-spaces on config/environment/test.rb template	Guillermo Iguaran	2011-05-23	1	-2/+2
\| *	Removing extra white-spaces on config/environment/development.rb template	Guillermo Iguaran	2011-05-23	1	-1/+1
\| *	Minor typo describing engine helpers	Matthew Daubert	2011-05-22	1	-2/+2