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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \| \| \|	adds the release notes of 3.1 to the index	Xavier Noria	2011-08-31	2	-0/+5
\|/ / /
* \| \|	adds the asset pipeline guide to the index	Xavier Noria	2011-08-30	3	-2/+7
* \| \|	Merge pull request #2684 from waynn/patch-2	Xavier Noria	2011-08-30	1	-4/+4
\|\ \ \
\| * \| \|	incorporate feedback from vijaydev and dasch to rephrase this to sound more n...	Waynn Lue	2011-08-26	1	-4/+4
* \| \| \|	Merge pull request #2720 from biow0lf/master	Xavier Noria	2011-08-29	1	-4/+4
\|\ \ \ \
\| * \| \| \|	Documentation fixes	Igor Zubkov	2011-08-29	1	-4/+4
\| \| \|/ / \| \|/\| \|
* / \| \|	Merge pull request #2723 from guilleiguaran/3-1-0-changelogs	Santiago Pastorino	2011-08-28	1	-0/+13
\|/ / /
* \| \|	Fix failing asset debug test under 1.8	Guillermo Iguaran	2011-08-25	1	-1/+1
* \| \|	Merge pull request #2681 from guilleiguaran/doc-changes	Xavier Noria	2011-08-25	2	-1/+12
\|\ \ \
\| * \| \|	Update Debugging Assets section of Assets Pipeline guide	Guillermo Iguaran	2011-08-25	1	-1/+8
\| * \| \|	Add missing CHANGELOG entries for Railties	Guillermo Iguaran	2011-08-25	1	-0/+4
\| \|/ /
* \| \|	Revert all the stuff to do with disallowing non-public methods for Module#del...	Jon Leighton	2011-08-25	1	-24/+0
* \| \|	Yes we need this to pass the test. we are using config.log_level.	Arun Agrawal	2011-08-25	1	-2/+2
* \| \|	Merge pull request #2688 from dasch/refactor-asset-debugging-tests	Aaron Patterson	2011-08-25	2	-42/+56
\|\ \ \
\| * \| \|	Move asset debugging tests into a separate test case	Daniel Schierbeck	2011-08-25	2	-42/+56
\| \|/ /
* \| \|	Moved strict validation changelog entry to right place	Bogdan Gusiev	2011-08-25	2	-1/+1
* \| \|	Merge pull request #2563 from bogdan/internal_validation	José Valim	2011-08-25	2	-2/+6
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add strict validation example to guides	Bogdan Gusiev	2011-08-24	2	-2/+6
* \| \|	fix ambiguous * and remove unused variable	Aaron Patterson	2011-08-24	1	-2/+2
* \| \|	fix ambiguous use of *	Aaron Patterson	2011-08-24	1	-1/+1
* \| \|	only define the encoding reader since we define the writer later on	Aaron Patterson	2011-08-24	1	-1/+2
* \| \|	we are sure we want to set the encoding, so silence warnings around it	Aaron Patterson	2011-08-24	2	-4/+9
* \| \|	the command line guide is good to go	Xavier Noria	2011-08-24	1	-1/+1
* \| \|	dealing with some -w warnings on startup	Aaron Patterson	2011-08-24	4	-2/+9
* \| \|	Add config.allow_debugging option to determine if the debug_assets query para...	Guillermo Iguaran	2011-08-24	4	-6/+55