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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	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.
* \| \| \| \| \|	Merge pull request #2647 from dmathieu/no_rescue	Santiago Pastorino	2011-08-24	2	-7/+8
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove useless rescue
\| * \| \| \| \| \|	remove useless rescue	Damien Mathieu	2011-08-24	2	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	params is a method, defined in every controller, which always returns a hash. If it raises a NoMethodError, it means there's a bug somewhere else, which we want to know about.
* \| \| \| \| \| \|	Merge pull request #2669 from BMorearty/remove-extra-word	Santiago Pastorino	2011-08-24	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|	docs: Remove extra word from sentence in initialization guide.
\| * \| \| \| \| \|	Remove extra word from sentence in initialization guide.	Brian Morearty	2011-08-23	1	-1/+1
\| \| \|_\|/ / / \| \|/\| \| \| \|
* / \| \| \| \|	Simplify JavaScriptHelper#escape_javascript	Daniel Schierbeck	2011-08-24	1	-7/+6
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the Linus-style conditional. Also fix the documentation slightly. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
* \| \| \| \|	`load` should also return the value from `super`	Aaron Patterson	2011-08-23	1	-1/+3
\| \| \| \| \|
* \| \| \| \|	require needs to return true or false. thank you Ryan "zenspider" Davis	Aaron Patterson	2011-08-23	1	-1/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #2607 from guilleiguaran/add-rbenv-gitignore	David Heinemeier Hansson	2011-08-23	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add .rbenv-version to .gitignore
\| * \| \| \| \|	Add .rbenv-version to .gitignore	Guillermo Iguaran	2011-08-20	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Make ActionController::TestCase#recycle! set @protocol to nil	David Majda	2011-08-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that the protocol does not get carried over when there are two or more requests in functional tests. This was a problem when e.g. the first request was HTTP and the second request was HTTPS. Closes #2654. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
* \| \| \| \| \|	Add failing test case for #2654	Andrew White	2011-08-23	1	-0/+17
\| \| \| \| \| \|
* \| \| \| \| \|	Ensure regexp and hash key are UTF-8	Andrew White	2011-08-23	2	-4/+16
\| \| \| \| \| \|
* \| \| \| \| \|	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.
\| * \| \| \| \| \|	Removed my name from the changelog as the amount of blogspam became ridiculous.	Joost Baaij	2011-08-22	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When will docrails be back? :-p
* \| \| \| \| \| \|	Merge pull request #2653 from luckydev/ser-wrap	Xavier Noria	2011-08-23	1	-0/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Missing require array/wrap in serialization
\| * \| \| \| \| \| \|	added missing require array/wrap in serialization	Anand	2011-08-23	1	-0/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2652 from dasch/remove-trailing-whitespace	Xavier Noria	2011-08-23	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove trailing whitespace
\| * \| \| \| \| \| \| \|	Remove trailing whitespace	Daniel Schierbeck	2011-08-23	1	-2/+2
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2651 from luckydev/serialization-tests	José Valim	2011-08-23	1	-1/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More tests for only-include and except-include options in serialization
\| * \| \| \| \| \| \| \|	added more tests for only-include and except-include options in serialization	Anand	2011-08-23	1	-1/+14
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Don't modify params in place - fixes #2624	Andrew White	2011-08-23	2	-5/+9
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2646 from guilleiguaran/add-destroy-alias-to-engine	Aaron Patterson	2011-08-22	1	-2/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Add destroy alias to engines
\| * \| \| \| \| \|	Add destroy alias to engines	Guillermo Iguaran	2011-08-22	1	-2/+3
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2411 from ai/debug_assets_by_config	Santiago Pastorino	2011-08-22	5	-19/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Debug assets by config
\| * \| \| \| \| \|	Allow to debug assets by config.assets.debug	Andrey A.I. Sitnik	2011-08-22	5	-19/+17
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2627 from luckydev/tr	Aaron Patterson	2011-08-22	2	-1/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	travis status image added
\| * \| \| \| \| \| \|	Travis status image added to GitHub README, excluding API pages.	Anand	2011-08-22	2	-1/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2611 from ognevsky/add-destroy-alias	Aaron Patterson	2011-08-22	2	-1/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added destroy alias to rails generator
\| * \| \| \| \| \| \| \|	Add Destroy Alias	Andrey Ognevsky	2011-08-22	2	-1/+4
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Added destroy alias to rails generator * add alias info for destroy command * Updated command line guides
* \| \| \| \| \| \| \|	Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251	Santiago Pastorino	2011-08-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use mysql_creation_options inside rescue block
\| * \| \| \| \| \| \| \|	Use mysql_creation_options inside rescue block	Jonathon M. Abbott	2011-08-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commit ecd37084b28a05f05251 did not take into account the use of creation_options inside the access denied exception handler.
* \| \| \| \| \| \| \| \|	Merge pull request #2634 from guilleiguaran/fix-sprockets-rewrite-asset-path	Joshua Peek	2011-08-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Sprockets rewrite_asset_path
\| * \| \| \| \| \| \| \| \|	Fix Sprockets rewrite_asset_path	Guillermo Iguaran	2011-08-22	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #2631 from dasch/refactor-sprockets	Santiago Pastorino	2011-08-22	1	-2/+7
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Refactor Sprockets::Helpers::RailsHelper#performing_caching?
\| * \| \| \| \| \| \| \|	Refactor Sprockets::Helpers::RailsHelper#performing_caching?	Daniel Schierbeck	2011-08-22	1	-2/+7
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No need for them lines to get so long! Also, move that comment into the method body where it belongs!
* \| \| \| \| \| \| \|	Merge pull request #2618 from FLOChip/unicode_j	Aaron Patterson	2011-08-21	2	-2/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix escape_javascript for unicode character \u2028.
\| * \| \| \| \| \| \| \|	fix escape_javascript for unicode character \u2028.	Teng Siong Ong	2011-08-21	2	-2/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2620 from cesario/3-1-0	Santiago Pastorino	2011-08-21	1	-1/+1
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CI and rename 1 misleading test case.
* \| \| \| \| \| \| \|	Fix sprockets warnings	Joshua Peek	2011-08-21	3	-7/+20
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2598
* \| \| \| \| \| \|	Merge pull request #2610 from asmega/documentation	Xavier Noria	2011-08-21	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added link to url_for in documentation
\| * \| \| \| \| \| \|	Use typewriter styling on url_for in documentation	asmega	2011-08-21	1	-1/+1
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14	Santiago Pastorino	2011-08-21	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump sprockets to 2.0.0.beta.14
\| * \| \| \| \| \| \|	Bump sprockets to 2.0.0.beta.14	Guillermo Iguaran	2011-08-20	1	-1/+1
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2600 from al/finder_sql_example_update	Xavier Noria	2011-08-21	1	-6/+10
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Updated the docs for the has_many :finder_sql option
\| * \| \| \| \| \|	Updated the docs for the has_many :finder_sql option to reflect changes made ↵	Alan Larkin	2011-08-20	1	-6/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in #a7e19b30ca71f62af516, i.e. the use of Procs when interpolation of the SQL is required.
* \| \| \| \| \| \|	Merge pull request #2596 from dharmatech/patch-1	Santiago Pastorino	2011-08-20	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionController::Redirecting : fix docs typo