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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove trailing whitespace	Daniel Schierbeck	2011-08-23	1	-2/+2
\|
*	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
\| * \| \| \|	ActionController::Redirecting : fix docs typo	dharmatech	2011-08-20	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #2595 from smartinez87/assets-guide	Santiago Pastorino	2011-08-20	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Document debugging assets set by default for dev and test envs on guides
\| * \| \| \|	Document debugging assets set by default for dev and test envs in the ↵	Sebastian Martinez	2011-08-19	1	-0/+2
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	asset_pipeline guide.
* \| \| \|	Merge pull request #2597 from dharmatech/patch-2	Santiago Pastorino	2011-08-20	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	actionpack/lib/action_controller/base.rb: docs typo
\| * \| \|	actionpack/lib/action_controller/base.rb: docs typo	dharmatech	2011-08-20	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #2604 from vijaydev/params_wrapper_docs	Santiago Pastorino	2011-08-20	1	-4/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Minor edit in the params wrapper api docs
\| * \| \|	params wrapper docs correction	Vijay Dev	2011-08-21	1	-4/+3
\| \|/ /
* \| \|	Merge pull request #2602 from ernie/fix_predicate_builder_primary_key_assumption	Aaron Patterson	2011-08-20	2	-1/+24
\|\ \ \ \| \| \| \| \| \| \| \|	Fix assumption of primary key name in PredicateBuilder subquery.
\| * \| \|	Fix PredicateBuilder clobbering select_values in subquery.	Ernie Miller	2011-08-20	2	-1/+14
\| \| \| \|
\| * \| \|	Fix assumption of primary key name in PredicateBuilder subquery.	Ernie Miller	2011-08-20	2	-1/+11
\| \|/ /
* \| \|	Merge pull request #2603 from vijaydev/guides	Santiago Pastorino	2011-08-20	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|	Minor change in the 3.1 release notes
\| * \|	minor change in the 3.1 release notes	Vijay Dev	2011-08-20	1	-1/+1
\|/ /
* \|	Merge pull request #2581 from guilleiguaran/debug-assets-in-dev	Santiago Pastorino	2011-08-19	2	-8/+24
\|\ \ \| \| \| \| \| \|	Debug assets by default in development and test environments
\| * \|	Debug assets by default in development and test environments	Guillermo Iguaran	2011-08-18	2	-8/+24
\| \| \|
* \| \|	Merge pull request #2589 from vijaydev/guides	Xavier Noria	2011-08-19	1	-31/+26
\|\ \ \ \| \|/ / \|/\| \|	Mailer guide fixes
\| * \|	mailer guide: fixes indentation, and use fixed width fonts wherever necessary	Vijay Dev	2011-08-20	1	-31/+26
\|/ /
* \|	minor details revised in a gsub	Xavier Noria	2011-08-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Regexps have a construct to express alternation of characters, which is character classes. In addition to being the most specific idiom to write this pattern, it reads better without the backslashes. Also, it is better not to use a capture if none is needed. As a side-effect of these changes, the gsub is marginally faster, but speed is not the point of this commit.
* \|	Merge branch 'master' of https://github.com/lifo/docrails	Xavier Noria	2011-08-17	15	-26/+5
\|\ \
\| * \|	Updates to remove extra whitespaces and notably fix a whitespace issue with ↵	Jeff Dutil	2011-08-16	10	-22/+1
\| \| \| \| \| \| \| \| \| \| \| \|	ajax_on_rails causing a code block not to render the entire block properly.
\| * \|	Fix typo in i18n.textile header and remove extra whitespace.	Jeff Dutil	2011-08-16	1	-2/+1
\| \| \|
\| * \|	Fix ruby typo to correctly render code block in initializer.textile	Jeff Dutil	2011-08-16	2	-2/+2
\| \| \|
\| * \|	Fix spacing in plugins.textile to fix html rendering and remove extra ↵	Jeff Dutil	2011-08-16	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	whitespace from security.textile
* \| \|	fixes generation of the AR querying guide	Xavier Noria	2011-08-17	1	-2/+2
\| \| \|
* \| \|	Merge pull request #2551 from rgo/remove-blank-spaces-application-css	Xavier Noria	2011-08-17	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Cleanup application.css