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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\|/ /
* \|	Merge pull request #1883 from arunagw/time_zone_fix	Aaron Patterson	2011-06-28	1	-4/+4
\|\ \ \| \| \| \| \| \|	Using not effected timezone in tests.
\| * \|	Using not effected timezone in tests.	Arun Agrawal	2011-06-29	1	-4/+4
\| \| \|
* \| \|	Merge pull request #1886 from arunagw/fix_test_for_jruby_db	Santiago Pastorino	2011-06-28	1	-2/+10
\|\ \ \ \| \| \| \| \| \| \| \|	fix test when running Jruby. If Jruby Platform is available the gem will
\| * \| \|	fix test when running Jruby. If Jruby Platform is available the gem will change.	Arun Agrawal	2011-06-29	1	-2/+10
\| \|/ /
* \| \|	Merge pull request #1574 from ↵	Aaron Patterson	2011-06-28	2	-1/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	oriolgual/1571_ar_relation_order_no_longer_works_with_arel_nodes Fix #1571 ActiveRecord::Relation#order no longer works with arel ordering nodes
\| * \| \|	Fix case	Oriol Gual	2011-06-28	1	-2/+1
\| \| \| \|
\| * \| \|	Update reverse order with new Arel Nodes	Oriol Gual	2011-06-28	1	-1/+2
\| \| \| \|
\| * \| \|	Add more test cases	Oriol Gual	2011-06-28	1	-0/+8
\| \| \| \|
\| * \| \|	Add failing test	Oriol Gual	2011-06-28	1	-0/+4
\| \|/ /
* \| \|	Merge pull request #1882 from ↵	Aaron Patterson	2011-06-28	1	-3/+3
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	rsim/fix_test_finding_with_cross_table_order_and_limit Fix test_finding_with_cross_table_order_and_limit for Oracle
\| * \|	Fix test_finding_with_cross_table_order_and_limit for Oracle	Raimonds Simanovskis	2011-06-28	1	-3/+3
\|/ / \| \| \| \|	Use latest Arel syntax and pass each order by expression as separate argument to order method as otherwise invalid Oracle SQL is generated.
* \|	Merge pull request #1857 from vijaydev/irreversible-migration	Aaron Patterson	2011-06-28	2	-7/+9
\|\ \ \| \| \| \| \| \|	IrreversibleMigration is not raised when a method not supported by reversible migrations is called in the change method of a migration
\| * \|	record unsupported methods in CommandRecorder instead of letting the ↵	Vijay Dev	2011-06-25	2	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \|	unsupported methods go through to the underlying db causing errors like duplicate columns to occur when rolling back migrations
* \| \|	Merge pull request #1860 from dmathieu/comparison	Aaron Patterson	2011-06-28	2	-0/+22
\|\ \ \ \| \| \| \| \| \| \| \|	Allow comparison on model objects - Closes #1858
\| * \| \|	comparing different classes returns nil	Damien Mathieu	2011-06-26	2	-1/+11
\| \| \| \|
\| * \| \|	allow comparison on model objects - Closes #1858	Damien Mathieu	2011-06-26	2	-0/+12
\| \| \| \|
* \| \| \|	remove useless assignment	Aaron Patterson	2011-06-28	1	-2/+1
\| \| \| \|
* \| \| \|	lock_optimistically is typically true, so evaluate the common failure case first	Aaron Patterson	2011-06-28	1	-1/+1
\| \| \| \|
* \| \| \|	reduce object allocation during AR instantiation	Aaron Patterson	2011-06-28	2	-3/+8
\| \| \| \|
* \| \| \|	Merge pull request #1878 from arunagw/mime_test_fix	José Valim	2011-06-28	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Removing image/gif from this test.
\| * \| \| \|	No need to register again. As it's default now.	Arun Agrawal	2011-06-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing gif from here because when it got unregister it start failing other places.
* \| \| \| \|	Update railties.gemspec	José Valim	2011-06-28	1	-0/+3
\|/ / / /
* \| \| \|	Copy the bin to railties so it also works if you don't have the rails gem.	José Valim	2011-06-28	1	-0/+2
\| \| \| \|
* \| \| \|	Merge pull request #1877 from arunagw/fix_mime	José Valim	2011-06-28	2	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix test to use Mime::Zip
\| * \| \| \|	Fix test to use Mime::Zip	Arun Agrawal	2011-06-28	2	-4/+4
\|/ / / /
* \| \| \|	Edited actionpack/CHANGELOG via GitHub	José Valim	2011-06-28	1	-0/+4
\| \| \| \|
* \| \| \|	Merge pull request #1875 from esad/master	José Valim	2011-06-28	3	-2/+44
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fixed issue #1847
\| * \| \| \|	Make send_file guess content-type from file extension, if type wasn't ↵	Esad Hajdarevic	2011-06-28	2	-2/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	supplied (Issue #1847). Update tests & documentation.