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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \| \| \|	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
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	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
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	prefer ends_with? over slicing	Xavier Noria	2011-08-16	1	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	AS guide: document in Module#delegate that the method must be public in the ↵	Xavier Noria	2011-08-16	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	target
\| * \| \| \| \| \| \|	Fix assets tests in railties	Jon Leighton	2011-08-16	2	-5/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Don't reference ActiveRecord::Base in initializers/wrap_parameters.rb. Use ↵	Jon Leighton	2011-08-16	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config.active_record instead. This yields about a 20% decrease in startup time because it means that the connection is not created immediately on startup. Of course, this is only useful if you are not going to immediately use the database after startup.
\| * \| \| \| \| \| \|	In 1efd88283ef68d912df215125951a87526768a51, ConnectionAdapters was put ↵	Jon Leighton	2011-08-16	3	-14/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	under eager_autoload. Due to the requires in that file, this caused ConnectionSpecification to be loaded, which references ActiveRecord::Base, which means the database connection is established. We do not want to connect to the database when Active Record is loaded, only when ActiveRecord::Base is first referenced by the user.
\| * \| \| \| \| \| \|	Revert "Merge pull request #2543 from htanata/unused_require_in_ar_test"	Santiago Pastorino	2011-08-16	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 87152f2604e73b218df90befda576f0acfed0bbf, reversing changes made to 0d3615f04c79f6e90d8ab33fdfc920b8faac9cb8.
\| * \| \| \| \| \| \|	Merge pull request #2543 from htanata/unused_require_in_ar_test	Santiago Pastorino	2011-08-16	1	-1/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused require in activerecord/test/cases/attribute_methods_test.rb
\| \| * \| \| \| \| \| \|	Remove unused require.	Hendy Tanata	2011-08-16	1	-1/+0
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Fix tzinfo require (it broke ↵	Jon Leighton	2011-08-16	1	-6/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test_raises_when_an_invalid_timezone_is_defined_in_the_config in railties)
\| * \| \| \| \| \| \|	Fix wrap_parameters initializer template	Jon Leighton	2011-08-16	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Be more lazy about creating time zone objects. Decreases startup time by ↵	Jon Leighton	2011-08-16	1	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	about 10%. (#734)
\| * \| \| \| \| \| \|	Don't refer to ActionController::Base in the wrap_parameters initializer - ↵	Jon Leighton	2011-08-16	3	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use config object instead. Cuts about 15% off the load time. (#734)
\| * \| \| \| \| \| \|	Bump arel dependency	Jon Leighton	2011-08-15	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use new SelectManager#source method	Jon Leighton	2011-08-15	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use new SelectManager#projections= method	Jon Leighton	2011-08-15	3	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	use update.key instead of update.ast.key. make better use of select manager.	Jon Leighton	2011-08-15	3	-26/+18
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use a SelectCore rather than a full SelectManager	Jon Leighton	2011-08-15	2	-4/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Refactor building the update manager	Jon Leighton	2011-08-15	4	-16/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Support for multi-table updates with limits, offsets and orders	Jon Leighton	2011-08-15	4	-2/+77
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Support updates with joins. Fixes #522.	Jon Leighton	2011-08-15	5	-4/+34
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Added Array#prepend as an alias for Array#unshift and Array#append as an ↵	David Heinemeier Hansson	2011-08-15	4	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	alias for Array#<< [DHH]
\| * \| \| \| \| \| \|	Merge pull request #2539 from arunagw/delegate_expl	Jon Leighton	2011-08-15	3	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delegate expl
\| \| * \| \| \| \| \| \|	Requiring delegate.	Arun Agrawal	2011-08-16	2	-0/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Removing unnecessary require, solve 'circular require considered harmful' ↵	Jon Leighton	2011-08-16	1	-2/+0
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	warning.
\| * \| \| \| \| \| \|	Fix typo	Santiago Pastorino	2011-08-15	1	-1/+1
\| \| \| \| \| \| \| \|