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
\|/
*	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
\| \| \| \|
* \| \| \|	adds the release notes of 3.1 to the index	Xavier Noria	2011-08-31	2	-0/+5
\|/ / /
* \| \|	Bump sprockets up	Santiago Pastorino	2011-08-30	1	-1/+1
\| \| \|
* \| \|	Revert "Merge pull request #2647 from dmathieu/no_rescue"	Santiago Pastorino	2011-08-30	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea.
* \| \|	Ensure correct ordering of results in ↵	Raimonds Simanovskis	2011-08-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test_update_all_with_joins_and_offset_and_order Last two asserts in this test assume that all_comments are ordered by posts.id and then by comments.id therefore additional ordering is added. Without it test was failing on Oracle which returned results in different order.
* \| \|	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 #2750 from rsim/fix_test_column_names_are_escaped_for_oracle	Jon Leighton	2011-08-30	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix test column names are escaped for oracle
* \| \| \|	Merge pull request #2636 from dasch/document-sprockets-compressors	Aaron Patterson	2011-08-30	1	-7/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Document the Sprockets compressors
\| * \| \| \|	Document the Sprockets compressors	Daniel Schierbeck	2011-08-30	1	-7/+23
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation to Sprockets::NullCompressor and Sprockets::LazyCompressor. Also, make LazyCompressor#compressor private, as it isn't part of the public API.
* \| \| \|	let SDoc add a link to the source code in GitHub for each method	Xavier Noria	2011-08-29	1	-0/+1
\| \| \| \|
* \| \| \|	Fix test failures on 1.8.7, since Object#initialize_dup is not defined there ↵	Jon Leighton	2011-08-29	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(and this call to super is no essential, so easiest to simply remove)
* \| \| \|	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 #2021 from dasch/more_postgres_utils	Aaron Patterson	2011-08-29	3	-16/+21
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make #extract_schema_and_table an instance method in Utils
\| * \| \| \| \|	Make #extract_schema_and_table an instance method in Utils	Daniel Schierbeck	2011-07-09	3	-16/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, move the utils test into its own test case.
* \| \| \| \| \|	Move clear_timestamp_attributes into Timestamp module	Jon Leighton	2011-08-29	2	-10/+14
\| \| \| \| \| \|
* \| \| \| \| \|	The join_nodes must be passed to the JoinDependency initializer and ↵	Jon Leighton	2011-08-29	4	-13/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	therefore counted by the alias tracker. This is because the association_joins are aliased on initialization and then the tables are cached, so it is no use to alias the join_nodes later. Fixes #2556.
* \| \| \| \| \|	Move the bulk alter table code into the abstract mysql adapter, hence it is ↵	Jon Leighton	2011-08-29	3	-47/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	supported for mysql2 as well now.
* \| \| \| \| \|	Extract simplified_type into the abstract class	Jon Leighton	2011-08-29	3	-23/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Create an AbstractMysqlAdapter to abstract the common code between ↵	Jon Leighton	2011-08-29	5	-1117/+726
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MysqlAdapter and Mysql2Adapter.