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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \| \|	Only call set_owner_attributes for has_one association if target exists.	Dieter Komendera	2011-07-04	2	-1/+12
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Revert "The rails gem doesn't have a lib directory - closes #1958."	Andrew White	2011-07-04	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RubyGems requires at least one require_path. This reverts commit e7fc5d1cad27e47d3d0149a2b9a61d074c30f225.
* \| \| \| \| \| \| \| \| \| \|	The rails gem doesn't have a lib directory - closes #1958.	Andrew White	2011-07-04	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1957 from vijaydev/add-validator-gem	Xavier Noria	2011-07-04	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Add w3c_validators gem to the doc group to fix failing validation of guides
\| * \| \| \| \| \| \| \| \| \|	add w3c_validators gem to the doc group to fix failing validation of guides	Vijay Dev	2011-07-04	1	-0/+1
\|/ / / / / / / / / /
* \| \| \| \| \| / / / /	Use an instance variable to store the current masss assignment options	Andrew White	2011-07-04	2	-13/+18
\| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1950 from dmathieu/require_railties	José Valim	2011-07-03	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add railties to the load path if it's not already there
\| * \| \| \| \| \| \| \| \|	Load the generators test helper and properly load it's test case	Damien Mathieu	2011-07-03	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1941 from vijaydev/command-recorder-fix	Jon Leighton	2011-07-03	2	-14/+8
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Reversing the changes related to CommandRecorder
\| * \| \| \| \| \| \| \| \|	Reversing the changes done in c278a2c while still resolving #1857.	Vijay Dev	2011-07-02	2	-14/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The changes broke bulk migration tests and were fixed in 4d256bc6; however that brought back the issue of #1857 and so this commit goes back to the original scenario and just adds change_table to the list of methods which are to be recorded in the CommandRecorder. The method_missing now delegates all calls to the underlying connection as before.
* \| \| \| \| \| \| \| \| \|	Merge pull request #1948 from dmathieu/html_safe_numeric	José Valim	2011-07-03	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All numerics should be html_safe
\| * \| \| \| \| \| \| \| \| \|	all numerics should be html_safe - Closes #1935	Damien Mathieu	2011-07-03	2	-1/+5
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #1945 from spohlenz/fix-engine-migrations-check	José Valim	2011-07-02	2	-1/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix has_migrations? check in Rails::Engine
\| * \| \| \| \| \| \| \| \| \|	Fix has_migrations? check in Rails::Engine	Sam Pohlenz	2011-07-03	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1925 from spohlenz/refactor-asset-paths	José Valim	2011-07-02	3	-9/+40
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Refactor sprockets asset paths to allow for alternate asset environments
\| * \| \| \| \| \| \| \| \| \|	Add documentation for asset_prefix and asset_environment	Sam Pohlenz	2011-07-03	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add tests for alternate asset prefix/environment	Sam Pohlenz	2011-07-01	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Refactor sprockets asset paths to allow for alternate asset environments	Sam Pohlenz	2011-07-01	1	-9/+18
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1940 from dmathieu/missing_location	Santiago Pastorino	2011-07-02	3	-1/+18
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Provide a more explicit message when we try to redirect to a missing location
\| * \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \|