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

	Commit message (Collapse)	Author	Age	Files	Lines
*	silences stderr to prevent an expected error message in the test suite from ↵	Xavier Noria	2011-05-13	1	-2/+1
\| \| \| \|	being echoed
*	say something when running bundle commands	Xavier Noria	2011-05-13	1	-0/+2
\| \| \| \| \| \|	This is convenient because we buffer stdout. In particular bundle install takes a while and generation just hangs there with no indication of what's going on otherwise.
*	say silence when you mean silence	Xavier Noria	2011-05-13	1	-1/+1
\|
*	application and plugin generation run bundle check unless --skip-gemfile	Xavier Noria	2011-05-13	6	-15/+37
\| \| \| \| \| \| \|	The purpose of this feature is that the user knows whether dependencies are satisfied. In particular, if they are not he will be warned upfront, rather than finding out himself in an abrupt way by trying to run something.
*	removes duplicate tests	Xavier Noria	2011-05-13	1	-13/+0
\|
*	Don't use mass-assignment protection when setting foreign keys or ↵	Jon Leighton	2011-05-12	3	-9/+45
\| \| \| \|	association conditions on singular associations. Fixes #481 (again).
*	Merge pull request #532 from amatsuda/update_script	José Valim	2011-05-12	1	-4/+14
\|\ \| \| \| \|	Revert "Delegate everything to the generator"
\| *	Revert "Delegate everything to the generator"	Akira Matsuda	2011-05-13	1	-4/+14
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 0904e8256864239f673bf91fce1cfffb9345ee61. reason: rake rails:update:scripts fails due to this change
* \|	Merge pull request #531 from amatsuda/update_javascripts	José Valim	2011-05-12	1	-7/+2
\|\ \ \| \| \| \| \| \|	remove update:javascripts rake task
\| * \|	remove update:javascripts rake task	Akira Matsuda	2011-05-13	1	-7/+2
\| \|/ \| \| \| \| \| \|	because javascript libraries are not bundled anymore, and create_javascript_files generator was already removed
* /	The new release supposedly fixed things, but it is still b0rked -- comment ↵	David Heinemeier Hansson	2011-05-12	1	-1/+1
\|/ \| \| \|	out for now pending JPs investigation into whats up
*	Proper fix	David Heinemeier Hansson	2011-05-12	1	-1/+1
\|
*	Fix the assets regexp for non-js/css files	David Heinemeier Hansson	2011-05-12	1	-1/+1
\|
*	Merge pull request #527 from joshk/deprecation_circular_dependency	Santiago Pastorino	2011-05-12	1	-2/+0
\|\ \| \| \| \|	Remove a circular require in AS deprecations.
\| *	Remove a circular require in AS deprecations. This is safe as AS ↵	Josh Kalderimis	2011-05-12	1	-2/+0
\|/ \| \| \|	deprecations is autoloaded as needed.
*	Merge pull request #524 from joshk/ar_create_mas_correction	José Valim	2011-05-12	4	-18/+44
\|\ \| \| \| \|	AR#create! allows for :as => role, and AR changelog update
\| *	updated AR#create! to accept an options hash so the mass-assignment security ↵	Josh Kalderimis	2011-05-12	4	-18/+44
\|/ \| \| \|	role can be passed in, also updated the Changelog to mention the change to some of the AR method signatures.
*	Merge pull request #227 from farski/master	Santiago Pastorino	2011-05-11	2	-6/+6
\|\ \| \| \| \|	Unnecessary redundancy in Time/Date calculations
\| *	Removed some redundant Time#change time options from beginning_of_ methods ↵	Chris Kalafarski	2011-03-13	2	-6/+6
\| \| \| \| \| \| \| \|	in Date and Time
* \|	Merge pull request #521 from seanmccann/patch-1	Santiago Pastorino	2011-05-11	1	-1/+0
\|\ \ \| \| \| \| \| \|	Removed extra newline at end of development config file. (There were 2)
\| * \|	Remove extra line at end of development config file.	Sean McCann	2011-05-11	1	-1/+0
\| \| \|
* \| \|	Merge pull request #491 from arunagw/readme_changes	Santiago Pastorino	2011-05-11	5	-7/+7
\|\ \ \ \| \| \| \| \| \| \| \|	Some readme fixes as required.
\| * \| \|	Some readme fixes as required.	Arun Agrawal	2011-05-10	5	-7/+7
\| \| \| \|
* \| \| \|	Depend on master uglifier for now	Santiago Pastorino	2011-05-11	2	-3/+3
\| \| \| \|
* \| \| \|	Merge pull request #512 from pivotalneutron/fix_eager_load_with_calculations	Jon Leighton	2011-05-11	3	-6/+18
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Bug fixes for calculations with includes
\| * \| \|	Bug fixes:	Fadzril Muhamad & Joseph Palermo	2011-05-12	3	-6/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- If doing a count on a relation that has an :include and a :join, it does a distinct even though it should not. - When doing a count on a relation that has an :include, it always falls back to a old style left join when performing the count. Looks like it was broken here: https://github.com/rails/rails/commit/b9599502c9e738a5a1513e75d08f8d40ed408265
* \| \| \|	Add missing requires	Santiago Pastorino	2011-05-11	2	-0/+2
\| \| \| \|
* \| \| \|	Merge pull request #515 from joshk/patch-3	José Valim	2011-05-11	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	updated the ActiveSupport changelog
\| * \| \| \|	updated the ActiveSupport changelog	Josh Kalderimis	2011-05-11	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #519 from knapo/master	José Valim	2011-05-11	2	-6/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	`guard_protected_attributes` has invalid assignment to be always true in attributes=
\| * \| \| \| \|	Fix assigning protected attributes by attributes=	knapo	2011-05-11	2	-6/+10
\|/ / / / /
* \| \| \| \|	Merge pull request #516 from gucki/master	Xavier Noria	2011-05-11	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	add missing require for ordered_hash dependency
\| * \| \| \| \|	add missing require for ordered_hash dependency	Corin Langosch	2011-05-11	1	-0/+1
\|/ / / / /
* / / / /	Don't remove the target if it has already been destroyed	Andrew White	2011-05-11	2	-1/+10
\|/ / / /
* \| \| \|	Merge pull request #513 from BlackBulletIV/patch-1	Xavier Noria	2011-05-11	2	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Modified CollectionAssociation documentation to refer to the new class name
\| * \| \|	Modified NamedScopeTest to use CollectionAssociation.	Michael Ebens	2011-05-11	1	-1/+1
\| \| \| \|
\| * \| \|	Modified CollectionAssociation to refer to the new class name.	Michael Ebens	2011-05-11	1	-1/+1
\|/ / /
* \| \|	Don't use select() values from the join model of a through association. ↵	Jon Leighton	2011-05-11	5	-3/+23
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #508.
* \| \|	Bring back obj.association_loaded? as a deprecated method. Fixes #472.	Jon Leighton	2011-05-11	2	-0/+22
\| \| \|
* \| \|	Merge pull request #509 from gucki/master	Jon Leighton	2011-05-11	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	fix bug in usage example of #unscoped
\| * \| \|	fix bug in usage example of #unscoped	Corin Langosch	2011-05-11	1	-1/+1
\|/ / /
* \| \|	Merge pull request #507 from dlee/fix_identity_map_tests	José Valim	2011-05-10	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Fix tests to reflect IdentityMap no longer default
\| * \| \|	Fix tests to reflect IdentityMap no longer default	David Lee	2011-05-10	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Broke in 0e1dcae1857db4f6721561caff38d8be748d0b40
* \| \| \|	Merge pull request #506 from dlee/custom_csrf_token_tests	José Valim	2011-05-10	2	-9/+33
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Test csrf token param name customization
\| * \| \| \|	Test csrf token param name customization	David Lee	2011-05-10	2	-9/+33
\| \|/ / /
* \| \| \|	Merge pull request #503 from smartinez87/conventions	José Valim	2011-05-10	5	-30/+30
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Follow code conventions on some tests
\| * \| \|	Follow code conventions on some tests	Sebastian Martinez	2011-05-10	5	-30/+30
\|/ / /
* \| \|	Merge pull request #501 from guilleiguaran/patch-2	José Valim	2011-05-10	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Adding .sass-cache to gitignore template
\| * \| \|	Adding .sass-cache to gitignore template	Guillermo Iguaran	2011-05-10	1	-0/+1
\|/ / /
* \| \|	Add test to specify that attributes from an association's conditions should ↵	Jon Leighton	2011-05-10	4	-4/+28
\| \| \| \| \| \| \| \| \| \| \| \|	be assigned without mass-assignment protection when a record is built on the association.