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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #2627 from luckydev/tr	Aaron Patterson	2011-08-22	2	-1/+4
\|\
\| *	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
\|\ \
\| * \|	Add Destroy Alias	Andrey Ognevsky	2011-08-22	2	-1/+4
\| \|/
* \|	Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251	Santiago Pastorino	2011-08-22	1	-1/+1
\|\ \
\| * \|	Use mysql_creation_options inside rescue block	Jonathon M. Abbott	2011-08-14	1	-1/+1
* \| \|	Merge pull request #2634 from guilleiguaran/fix-sprockets-rewrite-asset-path	Joshua Peek	2011-08-22	1	-1/+1
\|\ \ \
\| * \| \|	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?	Daniel Schierbeck	2011-08-22	1	-2/+7
\|/ /
* \|	Merge pull request #2618 from FLOChip/unicode_j	Aaron Patterson	2011-08-21	2	-2/+4
\|\ \
\| * \|	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 sprockets warnings	Joshua Peek	2011-08-21	3	-7/+20
\|/ /
* \|	Merge pull request #2610 from asmega/documentation	Xavier Noria	2011-08-21	1	-1/+1
\|\ \
\| * \|	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	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 to reflect changes made ...	Alan Larkin	2011-08-20	1	-6/+10
* \| \| \|	Merge pull request #2596 from dharmatech/patch-1	Santiago Pastorino	2011-08-20	1	-1/+1
\|\ \ \ \
\| * \| \| \|	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 in the asset_p...	Sebastian Martinez	2011-08-19	1	-0/+2
\| \|/ / /
* \| \| \|	Merge pull request #2597 from dharmatech/patch-2	Santiago Pastorino	2011-08-20	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	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
\|\ \ \
\| * \| \|	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 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	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	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 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
* \|	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 a...	Jeff Dutil	2011-08-16	10	-22/+1
\| * \|	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 whitesp...	Jeff Dutil	2011-08-16	2	-1/+2
* \| \|	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	Rafa García	2011-08-17	1	-3/+3
\|/ / /
* \| \|	making the order more clear, adding linux distros mailing lists to our cc	Aaron Patterson	2011-08-16	1	-10/+13
* \| \|	adding lessons learned so I do not make the same mistake twice	Aaron Patterson	2011-08-16	1	-0/+5
* \| \|	Properly escape glob characters.	Aaron Patterson	2011-08-16	3	-3/+27
* \| \|	properly escape html to avoid invalid utf8 causing XSS attacks	Aaron Patterson	2011-08-16	2	-1/+8