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

	Commit message (Expand)	Author	Age	Files	Lines
*	Add gem_group support to generators	Wojciech Mach	2011-09-04	4	-1/+61
*	Add bcrypt-ruby to Gemfile template	Guillermo Iguaran	2011-09-03	1	-0/+3
*	fixes CSS example in the asset pipeline guide	Xavier Noria	2011-09-03	1	-1/+1
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-09-02	5	-70/+161
\|\
\| *	Revert "Fixing guides validation errors."	Vijay Dev	2011-09-02	10	-24/+18
\| *	debug option to js, stylesheet tags are ignored when debug mode is off	Vijay Dev	2011-09-02	1	-1/+1
\| *	Merge branch 'fix_validation_errors'	Andrew Olson	2011-09-02	10	-17/+23
\| \|\
\| \| *	Fixing guides validation errors.	Andrew Olson	2011-09-02	10	-18/+24
\| * \|	When a collection is empty, render returns nil.	Matt Burke	2011-09-02	1	-0/+7
\| * \|	Change the styling of '<ruby>initialize</ruby>' to '+initialize+' (the former...	Stephen J. Butler	2011-09-01	1	-1/+1
\| * \|	fix some minor omissions in pipeline docs	Richard Hulse	2011-09-02	1	-5/+18
\| * \|	Add #update_attributes as another alternative to #update_column.	Sebastian Martinez	2011-09-01	1	-1/+1
\| * \|	Revert "Fix logic in 3.1 release notes sentence"	Vijay Dev	2011-09-01	1	-1/+1
\| * \|	Modified ActionMailer Basics doc with the following change:	Andy Leeper	2011-09-01	1	-2/+3
\| * \|	Change "SCSS" to "Sass" in sentences where it's referred to as "language", be...	Roy Tomeij	2011-09-01	1	-5/+5
\| \|/
\| *	Move css data URI into css/erb section	Richard Hulse	2011-09-01	1	-8/+8
\| *	pipeline docs improvement	Richard Hulse	2011-09-01	1	-20/+25
\| *	pipeline docs - spelling and some whitespace	Richard Hulse	2011-09-01	1	-5/+5
\| *	Adding reference about ExecJS for CoffeeScript	Guillermo Iguaran	2011-09-01	1	-2/+4
\| *	Add reference to ExecJS in JavaScript Compression section	Guillermo Iguaran	2011-09-01	1	-1/+3
\| *	Fixing sass-rails helpers methods examples	Guillermo Iguaran	2011-09-01	1	-4/+4
\| *	Giving info about what are the defaults for test environment	Guillermo Iguaran	2011-09-01	1	-1/+1
\| *	update pipeline docs to reflect new defaults	Richard Hulse	2011-09-01	1	-32/+93
\| *	Review config.assets options.	Guillermo Iguaran	2011-08-31	1	-1/+1
* \|	fix indent for generator environment method	Alexey Vakhov	2011-09-02	2	-2/+2
* \|	assets:precompile should not append asset digests when config.assets.digest i...	Sam Pohlenz	2011-09-01	1	-0/+26
* \|	Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changes	Santiago Pastorino	2011-08-31	2	-1/+14
* \|	should be using a / in this route rather than a #	Aaron Patterson	2011-08-31	1	-1/+1
\|/
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-08-31	3	-2/+14
\|\
\| *	Added new asset config options to guides	Richard Hulse	2011-09-01	1	-0/+12
\| *	Update wording surrounding template file extensions to include Rails 3 and ab...	Greg Leppert	2011-08-31	1	-1/+1
\| *	make code example agree with text just above	Ray Baxter	2011-08-31	1	-1/+1
* \|	Instructions for nginx and apache added	Kir	2011-08-31	1	-2/+28
\|/
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-08-31	2	-3/+50
\|\
\| *	Add section to pipeline docs to help people upgrading	Richard Hulse	2011-09-01	1	-0/+47
\| *	Fixing spelling, throught -> through.	Andrew Olson	2011-08-31	1	-1/+1
\| *	Fix logic in 3.1 release notes sentence	Rodrigo Rosenfeld Rosas	2011-08-31	1	-1/+1
\| *	Merge branch 'master' of git://github.com/rails/rails	Xavier Noria	2011-08-31	38	-136/+282
\| \|\
\| * \|	Fix typo: => instead of =	Semyon Perepelitsa	2011-08-31	1	-1/+1
* \| \|	Fix asset debugging tests to reflect last changes in 3-1-stable	Guillermo Iguaran	2011-08-31	1	-9/+18
* \| \|	Set default location of manifest with config.assets.manifest	Guillermo Iguaran	2011-08-31	3	-0/+21
* \| \|	Backport f443f9cb0c64 to master	Guillermo Iguaran	2011-08-31	4	-22/+24
* \| \|	Backport b0f30631662 to master	Guillermo Iguaran	2011-08-31	1	-3/+2
* \| \|	Read digests of assets from manifest.yml if config.assets.manifest is on	Guillermo Iguaran	2011-08-31	3	-4/+74
* \| \|	Merge pull request #2706 from mitio/doc-changes	Vijay Dev	2011-08-31	1	-11/+11
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Fixed typos and made minor changes in the Plugins guide.	Dimitar Dimitrov	2011-08-27	1	-11/+11
* \| \|	syncs assets guide with what's in 3-1-stable	Xavier Noria	2011-08-31	1	-11/+27
* \| \|	Merge pull request #2761 from raybaxter/bump_api_url	Xavier Noria	2011-08-31	1	-1/+1
\|\ \ \
\| * \| \|	don't need edgeapi now that we are on 3.1	Ray Baxter	2011-08-30	1	-1/+1
* \| \| \|	release notes: adds a couple of blank lines to get the markup right	Xavier Noria	2011-08-31	1	-0/+2