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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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.
* \| \| \| \|	Merge pull request #2724 from ↵	Santiago Pastorino	2011-08-28	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	guilleiguaran/avoid-recursive-call-sprockets-helper Avoid extra recursive call in Sprockets helpers
\| * \| \| \| \|	Avoid extra recursive call in Sprockets helpers	Guillermo Iguaran	2011-08-28	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #2723 from guilleiguaran/3-1-0-changelogs	Santiago Pastorino	2011-08-28	3	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update changelogs for Rails 3.1.0
* \| \| \| \|	fixing typo	Aaron Patterson	2011-08-28	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Bump rack-cache, rack-test, rack-mount and sprockets up	Santiago Pastorino	2011-08-28	1	-4/+4
\| \| \| \| \|
* \| \| \| \|	clear and disable query cache when an exception is raised from called middleware	Aaron Patterson	2011-08-28	2	-1/+33
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #2711 from dasch/patch-3	Aaron Patterson	2011-08-28	1	-14/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Refactor ActionDispatch::Http::UploadedFile
\| * \| \| \|	Refactor ActionDispatch::Http::UploadedFile	Daniel Schierbeck	2011-08-28	1	-14/+3
\|/ / / /
* \| \| \|	deletes spurious arrow	Xavier Noria	2011-08-27	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #2714 from vijaydev/docs	Santiago Pastorino	2011-08-27	3	-15/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	doc fixes
\| * \| \| \|	doc fixes	Vijay Dev	2011-08-28	3	-15/+19
\|/ / / /
* \| \| \|	use sdoc to generate the API	Xavier Noria	2011-08-27	2	-2/+4
\| \| \| \|
* \| \| \|	stop messing with the load path, load path should be adjusted in the test task	Aaron Patterson	2011-08-26	1	-7/+0
\| \|_\|/ \|/\| \|
* \| \|	Merge pull request #2702 from arunagw/removed_unused_var	Santiago Pastorino	2011-08-26	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Removed Unused Variable.
\| * \| \|	Removed Unused Variable.	Arun Agrawal	2011-08-26	1	-1/+1
\|/ / /
* \| \|	Merge pull request #2699 from guilleiguaran/fix-asset-debugging-test-1.8	Aaron Patterson	2011-08-25	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Fix failing asset debug test under 1.8
\| * \| \|	Fix failing asset debug test under 1.8	Guillermo Iguaran	2011-08-25	1	-1/+1
\|/ / /
* \| \|	Force binary data inserted for a string data type to utf-8 and log an	Aaron Patterson	2011-08-25	2	-3/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	error. Strings tagged as binary will be stored in sqlite3 as blobs. It is an error to insert binary data to a string column, so an error is emitted in the log file. People are highly encouraged to track down the source of the binary strings and make sure that the encoding is set correctly before inserting to the database.
* \| \|	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	7	-194/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Module#delegate