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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| * \|	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
\| \|
* \|	Tags with invalid names should also be stripped in order to prevent	Aaron Patterson	2011-08-16	2	-1/+8
\| \| \| \| \| \| \| \|	XSS attacks. Thanks Sascha Depold for the report.
* \|	prevent sql injection attacks by escaping quotes in column names	Aaron Patterson	2011-08-16	4	-3/+20
\| \|
* \|	adding security email address	Aaron Patterson	2011-08-16	1	-2/+1
\| \|
* \|	Merge branch 'master' of github.com:rails/rails	Xavier Noria	2011-08-16	3	-16/+9
\|\ \
\| * \|	Use lazy load hooks to set parameter wrapping configuration. This means that ↵	Jon Leighton	2011-08-16	3	-16/+9
\| \| \| \| \| \| \| \| \| \| \| \|	it doesn't force Action Controller / Active Record to load, but it doesn't fail if they have already loaded. Thanks @josevalim for the hint.
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Xavier Noria	2011-08-16	12	-81/+124
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Fix formatting of active_record_validations_callbacks.textile so guide will ↵	Jeff Dutil	2011-08-16	1	-2/+2
\| \| \| \| \| \| \| \|	render properly at http://edgeguides.rubyonrails.org/active_record_validations_callbacks.html#displaying-validation-errors-in-the-view
\| *	document Array#append and Array#prepend methods in AS guide	Vijay Dev	2011-08-16	1	-0/+24
\| \|
\| *	Document Hash#extract!.	Sebastian Martinez	2011-08-15	2	-0/+14
\| \|
\| *	Fixed mistakes in layouts/rendering guide about yield	Jacob Mattingley	2011-08-15	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	yield(:unspecified_block) actually returns true even if :unspecified_block never exists. This means you can't use the form yield(:unspecified_block) or yield.
\| *	Updates to Asset Pipeline Guide	JESii	2011-08-15	1	-45/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grammar/syntax/style changes: 1. Changed all 'we' to 'you' 2. Corrected typos 3. Make consistent styline (e.g., dashes & double-dash usage) 4. Change use of future tense (will...) to present tense (easier to read).
\| *	assets guide - add info about require_directory, minor rephrasings	Vijay Dev	2011-08-15	1	-5/+7
\| \|
\| *	minor changes in app templates guide	Vijay Dev	2011-08-15	1	-7/+1
\| \|
\| *	Merge pull request #58 from cameel/fix-set_autoload_path-typo	Kamil Śliwak	2011-08-14	1	-1/+1
\| \|\ \| \| \| \| \| \|	Fix a typo in 'Configuring Rails Applications' guide
\| \| *	Fix a typo in 'Configuring Rails Applications' guide	Kamil Śliwak	2011-08-15	1	-1/+1
\| \|/ \| \| \| \|	- The initializer is called `set_autoload_paths`, not `set_autoload_path`. See https://github.com/rails/rails/blob/master/railties/lib/rails/engine.rb#L506
\| *	Typo	Raul Murciano	2011-08-14	1	-1/+1
\| \|