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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are the options from a brand new app, and should help people get it right when upgrading.
\| * \| \| \|	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 some typos and made minor text changes in the Plugins guide.
\| * \| \| \| \|	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
\| * \| \| \| \|	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
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Rephrasing to sound more natural, and some grammar fixes.
\| * \| \| \|	incorporate feedback from vijaydev and dasch to rephrase this to sound more ↵	Waynn Lue	2011-08-26	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	natural, and some grammar fixes.
* \| \| \| \|	Merge pull request #2720 from biow0lf/master	Xavier Noria	2011-08-29	1	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Doc fixes
\| * \| \| \| \|	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
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Update changelogs for Rails 3.1.0
* \| \| \|	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
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Documentation changes: Assets Pipeline guide and Railties changelog
\| * \| \| \|	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 ↵	Jon Leighton	2011-08-25	1	-24/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Module#delegate
* \| \| \|	Yes we need this to pass the test. we are using config.log_level.	Arun Agrawal	2011-08-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken test test_copying_migrations(RailtiesTest::EngineTest): NoMethodError: undefined method `log_level' for #<Rails::Engine::Configuration:0xb87a98c>
* \| \| \|	Merge pull request #2688 from dasch/refactor-asset-debugging-tests	Aaron Patterson	2011-08-25	2	-42/+56
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Refactor asset debugging tests
\| * \| \| \|	Move asset debugging tests into a separate test case	Daniel Schierbeck	2011-08-25	2	-42/+56
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also: - Refactor AssetDebuggingTest. - Use the %r regexp syntax. That way we don't need to escape the /'s.
* \| \| \|	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
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Implemented strict validation concept
\| * \| \|	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 ↵	Guillermo Iguaran	2011-08-24	4	-6/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	param can be passed by user
* \| \| \|	Merge pull request #2390 from arunagw/test_for_environment_file	Santiago Pastorino	2011-08-24	1	-0/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Test added to check development.rb, test.rb and production.rb content
\| * \| \| \|	Test added to check mass_assignment_sanitizer is not present if ↵	Arun Agrawal	2011-08-03	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	--skip-active-record provided.
* \| \| \| \|	Remove extra word from sentence in initialization guide.	Brian Morearty	2011-08-23	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #2616 from tilsammans/patch-2	Xavier Noria	2011-08-23	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Removed my name from the changelog as the amount of blogspam became ridic
\| * \| \| \| \|	removed the link to my blog to help stop endless comments	Joost Baaij	2011-08-23	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Revert "Removed my name from the changelog as the amount of blogspam became ↵	Joost Baaij	2011-08-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ridiculous. " This reverts commit 95bece9155c46a2273a3febc3a2e176b8c15df8f.