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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \| \| \| \|	update pipeline docs to reflect new defaults	Richard Hulse	2011-09-01	1	-32/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Production section has been changed to reflect the new default of precompilation and using the asset manifest. Development has been swapped around to reflect the new default (debug mode is on). Other changes to support this elsewhere.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Review config.assets options.	Guillermo Iguaran	2011-08-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #61 from gabebw/master	Xavier Noria	2011-08-31	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve examples by using .each instead of for...in
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Improve examples: use each instead of for...in	Gabe Berke-Williams	2011-08-31	2	-2/+2
\| \|/ / / / / / / / / / / / /
* \| / / / / / / / / / / / /	Remove hard dependency on bcrypt.	Guillermo Iguaran	2011-09-02	3	-3/+4
\| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2811 from avakhov/fix-environment-generator-action	José Valim	2011-09-02	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	fix indent for generator environment method
\| * \| \| \| \| \| \| \| \| \| \| \|	fix indent for generator environment method	Alexey Vakhov	2011-09-02	2	-2/+2
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	* Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731	Aaron Patterson	2011-09-01	3	-2/+27
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	make sure encoding_aware? is available	Aaron Patterson	2011-09-01	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	CookieJar is enumerable. fixes #2795	Aaron Patterson	2011-09-01	3	-0/+23
\| \|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2775 from jaw6/fix/reverse	Aaron Patterson	2011-09-01	2	-4/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes bug in ActiveRecord::QueryMethods, #1697
\| * \| \| \| \| \| \| \| \| \| \|	Fixes bug in ActiveRecord::QueryMethods, #1697	Joshua Wehner	2011-08-31	2	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace split on comma with a regexp that will reverse all ASC/DESC specifically
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2718 from dasch/patch-5	Vijay Dev	2011-09-01	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Split long string into multiple shorter ones
\| * \| \| \| \| \| \| \| \| \| \| \|	Split long string into multiple shorter ones	Daniel Schierbeck	2011-08-29	1	-1/+4
\| \| \|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes the code more readable.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2585 from marcgg/fix-ruby19-splitoptions	José Valim	2011-09-01	2	-1/+20
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In some case ActiveResource fails to handle serialized attributes with Ruby 1.9 and crashes
\| * \| \| \| \| \| \| \| \| \| \| \|	Do not use objects that don't respond to to_sym (integers, floats, dates...) ↵	Marc G Gauthier	2011-09-01	2	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as parameters
\| * \| \| \| \| \| \| \| \| \| \| \|	Do not try to use as a parameter elements that are not acceptable	Marc G Gauthier	2011-08-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2788 from spohlenz/precompile-without-digests-master	José Valim	2011-09-01	2	-4/+31
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	assets:precompile should not append asset digests when config.assets.digest is false
\| * \| \| \| \| \| \| \| \| \| \| \| \|	assets:precompile should not append asset digests when config.assets.digest ↵	Sam Pohlenz	2011-09-01	2	-4/+31
\|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is false
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2787 from guilleiguaran/changelogs-3-1-1-master	José Valim	2011-09-01	1	-1/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing changelog entries for 3.1.1
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add missing changelog entries for 3.1.1	Guillermo Iguaran	2011-09-01	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2786 from spohlenz/extract-asset-paths-config-master	José Valim	2011-09-01	1	-5/+14
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Remove explicit references to Rails.application.config from AssetPaths in Sprockets helper
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Move references to Rails.application.config out of Sprockets AssetPaths	Sam Pohlenz	2011-09-01	1	-5/+14
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changes	Santiago Pastorino	2011-08-31	3	-21/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Assets pipeline: fix in manifest location and remove unused code
* \| \| \| \| \| \| \| \| \| \| \| \|	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 ↵	Greg Leppert	2011-08-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	above.
\| * \| \| \| \| \| \| \| \| \| \| \|	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	177	-1815/+2490
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo: => instead of =	Semyon Perepelitsa	2011-08-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2772 from guilleiguaran/backports-assets-pipeline	José Valim	2011-08-31	10	-36/+160
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Backports of the assets pipeline changes done in 3-1-stable
\| * \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-2/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Backport f443f9cb0c64 to master	Guillermo Iguaran	2011-08-31	8	-52/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-6/+105
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them ↵	Chris Griego	2011-08-31	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	public." to support date implementations without private to_date/to_datetime on Time (home_run). This reverts commit 080345baca1076a9788dff4803153600aec31f86. Signed-off-by: José Valim <jose.valim@gmail.com>
* \| \| \| \| \| \| \| \| \| \| \| \|	Always enable digest and compile in the Rake task	Guillermo Iguaran	2011-08-31	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \|