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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \|	provide a more explicit message when using url_for with nil	Damien Mathieu	2011-07-02	3	-1/+18
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes the problem of having a non-explicit message when the :location option is not provided in respond_with.
* \| \| \| \| \| \| \| \|	Merge pull request #1938 from joefiorini/master	José Valim	2011-07-01	2	-6/+69
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make to_json take a parameter to exclude root
\| * \| \| \| \| \| \| \| \|	Enable passing root: false to #to_json	Joe Fiorini	2011-07-01	2	-6/+69
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	a few minor performance improvements: fewer strings, fewer range objects, ↵	Aaron Patterson	2011-07-01	2	-22/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fewer method calls
* \| \| \| \| \| \| \| \|	require 'thread' before using mutex	José Valim	2011-07-01	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	calling super is super. if the other object is exactly equal, we can return ↵	Aaron Patterson	2011-07-01	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	early
* \| \| \| \| \| \| \| \|	remove unused codes	Aaron Patterson	2011-07-01	1	-4/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	It's autoload all the way down	Andrew White	2011-07-01	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Don't require ActionView::Context as it's autoloaded	Andrew White	2011-07-01	1	-1/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Revert "Add missing require for ActionView::AssetPaths"	Andrew White	2011-07-01	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 987eb7d4236513978e3cfcd5c3c159d95d2a84c8.
* \| \| \| \| \| \| \| \|	Add missing requires for ActionView::Context and Module#instance_method_names	Andrew White	2011-07-01	1	-0/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add missing require for ActionView::AssetPaths	Andrew White	2011-07-01	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add assets_gemfile_entry.	José Valim	2011-07-01	2	-5/+11
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Revert "Add method fields_for_with_index to FormHelper"	José Valim	2011-07-01	3	-145/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 7c562d5e460d97b18e4f3367b3cfb13401732920. Conflicts: actionpack/lib/action_view/helpers/form_helper.rb
* \| \| \| \| \| \| \| \|	reduce calls to owners_by_key and to read_attribute, respond_to? etc	Aaron Patterson	2011-07-01	1	-2/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1927 from bogdan/select_multiple_index	José Valim	2011-07-01	2	-1/+8
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Fixed ActionView::FormOptionsHelper#select with :multiple => false
\| * \| \| \| \| \| \| \|	Fixed ActionView::FormOptionsHelper#select with :multiple => false	Bogdan Gusiev	2011-06-30	2	-1/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove AssociationReflection#create_association and ↵	Jon Leighton	2011-06-30	1	-17/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AssociationReflection#create_association! - they are not called from anywhere.
* \| \| \| \| \| \| \| \|	Assign the association attributes to the associated record before the ↵	Jon Leighton	2011-06-30	8	-12/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	before_initialize callback of the record runs. Fixes #1842.
* \| \| \| \| \| \| \| \|	match method signature of the superclass	Aaron Patterson	2011-06-30	2	-4/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	call super rather than delegating to the other objects equal? method	Aaron Patterson	2011-06-30	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	just alias eql? to == for frewer method calls	Aaron Patterson	2011-06-30	1	-5/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	only calculate method name once	Aaron Patterson	2011-06-30	1	-2/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	cache the plural name on the reflection so we do not pay pluralize costs on ↵	Aaron Patterson	2011-06-30	3	-8/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	joins
* \| \| \| \| \| \| \| \|	Depend on edge version of sass-rails	Santiago Pastorino	2011-06-30	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Depend on edge version of coffee-rails	Santiago Pastorino	2011-06-30	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Document the change to Array.wrap's behaviour that was made in ↵	Jon Leighton	2011-06-30	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	b4d8c7d148c6b44eea6701687ca2a97df9088747
* \| \| \| \| \| \| \| \|	Make sure respond_with with :js tries to render a template in all cases	José Valim	2011-06-30	4	-6/+23
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Master version is 3.2.0.beta	Santiago Pastorino	2011-06-30	9	-17/+17
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Bump up rack-cache and tzinfo	Santiago Pastorino	2011-06-30	2	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Allow CI to use the latest rubygems version	Santiago Pastorino	2011-06-30	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Update CI config	Santiago Pastorino	2011-06-30	2	-9/+9
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add has_key? and key? methods to CookieJar removed in 0ca69ca65f83b4bb34f8	José Valim	2011-06-30	2	-0/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1690 from vijaydev/mattr_accessor_changes	José Valim	2011-06-30	2	-2/+13
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Added instance_accessor: false to Module#mattr_accessor
\| * \| \| \| \| \| \| \|	Added instance_accessor: false to Module#mattr_accessor	Vijay Dev	2011-06-14	2	-2/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Move Coffee generators and templates to Coffee Railtie and create ↵	Santiago Pastorino	2011-06-29	10	-46/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	javascript_engine ("js") for apps that remove Coffee gem
* \| \| \| \| \| \| \| \|	CommandRecorder should delegate in method_missing where possible. Fixes some ↵	Jon Leighton	2011-06-30	2	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tests in migration_test.rb under mysql. The problem was introduced in c278a2c5e109204ec8a47fcbfdfc327aad7996ce.
* \| \| \| \| \| \| \| \|	Array.wrap should follow Kernel#Array semantics when the object's to_ary is ↵	Jon Leighton	2011-06-30	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nil. In this case, the object should be wrapped.
* \| \| \| \| \| \| \| \|	Define to_ary on ActiveRecord::Base to return nil. Improve performance of ↵	Jon Leighton	2011-06-30	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Array#flatten under 1.9, see comment for details.
* \| \| \| \| \| \| \| \|	sub suffices here	Xavier Noria	2011-06-29	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Revert "Delegate to @flashes with 'delegate' instead of manually."	Aaron Patterson	2011-06-29	1	-2/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 701e8554a8f69b0c81fe794cba985bfda804161b.
* \| \| \| \| \| \| \| \|	Merge pull request #1909 from r00k/master	José Valim	2011-06-29	1	-24/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use 'delegate' macro instead of writing out methods by hand
\| * \| \| \| \| \| \| \| \|	Delegate to @flashes with 'delegate' instead of manually.	Ben Orenstein	2011-06-29	1	-24/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #1899 from ihower/patch_rake_test	José Valim	2011-06-29	2	-2/+32
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make "rake test" display not only task name but also exception message.
\| * \| \| \| \| \| \| \| \|	Add test to rake test for error messages	Wen-Tien Chang	2011-06-30	2	-1/+31
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make "rake test" display not only task name but also exception message.	Wen-Tien Chang	2011-06-29	1	-2/+2
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix configurable cristalization and tests.	José Valim	2011-06-29	2	-8/+18
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	[IMPORTANT] Make "sprockets/railtie" require explicit.	José Valim	2011-06-29	11	-10/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes "sprockets/railtie" explicit. This means that sprockets will be loaded when you require "rails/all". If you are not using requiring "rails/all", you need to manually load it with all other framework railties. In order to be complete, this commit also adds --skip-sprockets to the rails generator.
* \| \| \| \| \| \| \| \|	Merge pull request #1897 from istewart/active_model_dirty_patch	José Valim	2011-06-29	2	-1/+10
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	ActiveModel::Dirty patch for multiple assignments to the same attribute
\| * \| \| \| \| \| \| \|	changing an attribute multiple times retains the correct original value	Ian Stewart	2011-06-28	2	-1/+10
\|/ / / / / / / /