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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \|	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.
\| * \| \| \|	Register some commonly used mime types (png, jpeg, pdf, zip etc.) per default	Esad Hajdarevic	2011-06-28	1	-0/+12
\|/ / / /
* \| \| \|	remove the check for needs_type_condition? because ensure_proper_type will ↵	Aaron Patterson	2011-06-27	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pick up the type column
* \| \| \|	stop using && for the short circuit side effect	Aaron Patterson	2011-06-27	1	-1/+1
\| \| \| \|
* \| \| \|	let strings be converted to symbols inside the interpreter	Aaron Patterson	2011-06-27	1	-2/+2
\| \| \| \|
* \| \| \|	avoice paying hash cost if there are no serialized attributes	Aaron Patterson	2011-06-27	1	-3/+4
\| \| \| \|
* \| \| \|	cache column defaults for AR object instantiation	Aaron Patterson	2011-06-27	3	-3/+16
\| \| \| \|
* \| \| \|	AR object instantiation is ~30% faster in the simple case	Aaron Patterson	2011-06-27	2	-1/+17
\| \| \| \|
* \| \| \|	initialize instance variables	Aaron Patterson	2011-06-27	1	-0/+2
\| \| \| \|
* \| \| \|	oops! remove debugging codes	Aaron Patterson	2011-06-27	1	-1/+0
\| \| \| \|
* \| \| \|	default create_with_value to a hash so we can eliminate conditionals, add ↵	Aaron Patterson	2011-06-27	5	-5/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test surrounding create_with(nil) behavior
* \| \| \|	Merge pull request #1871 from guilleiguaran/arel-2-1-3	Aaron Patterson	2011-06-27	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Bump ARel to 2.1.3
\| * \| \| \|	Bump ARel to 2.1.3	Guillermo Iguaran	2011-06-27	2	-2/+2
\| \|/ / /
* \| \| \|	Merge pull request #1870 from chriseppstein/asset_urls_master	Santiago Pastorino	2011-06-27	8	-72/+216
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Asset urls master
\| * \| \| \|	Added a configuration setting:	Chris Eppstein	2011-06-27	6	-17/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config.action_controller.default_asset_host_protocol It's best to leave this unset. When unset the :request protocol is used whenever it can be and :relative is used in the other situations. When set to :request then assets hosts will be disabled when there is no request in scope and will use the request protocol whenever a request is in scope. If set to :relative, then a relative protocol is always used except for stylesheet link tags which must use the :request protocol to avoid double downloads in IE6&7. Conflicts: actionpack/lib/sprockets/helpers/rails_helper.rb actionpack/test/template/sprockets_helper_test.rb
\| * \| \| \|	Move the config bootstrapping to initialization to minimize access to the ↵	Chris Eppstein	2011-06-27	2	-11/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails.application global.
\| * \| \| \|	Stylesheet link tags should use the request protocol to avoid duplicate ↵	Chris Eppstein	2011-06-27	5	-27/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	download of stylesheets in IE7 and IE8. Conflicts: actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb actionpack/lib/sprockets/helpers/rails_helper.rb
\| * \| \| \|	Add asset_url helper and refactor the asset paths so that asset hosts can be ↵	Chris Eppstein	2011-06-27	5	-47/+129
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	used during asset precompilation. Conflicts: actionpack/lib/action_view/asset_paths.rb actionpack/lib/sprockets/helpers/rails_helper.rb actionpack/test/template/sprockets_helper_test.rb
\| * \| \| \|	OrderedOptions must implement respond_to? if it implements method_missing.	Chris Eppstein	2011-06-27	2	-9/+7
\| \| \| \| \|
* \| \| \| \|	the generated ALT attribute for images no longer contains the digest, if any	Xavier Noria	2011-06-27	2	-1/+13
\|/ / / /
* \| \| \|	Add JavaScript Runtime name to the Rails Info properties (thanks Sam Ruby)	David Heinemeier Hansson	2011-06-27	1	-0/+4
\| \| \| \|
* \| \| \|	Merge pull request #1481 from arunagw/lib_assets	David Heinemeier Hansson	2011-06-27	2	-1/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Generating /lib/assets for assets
\| * \| \| \|	Using lib/assets only. Javascripts/Stylesheets people can fill later.	Arun Agrawal	2011-06-16	2	-1/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1861 from dchelimsky/fixture_path	Santiago Pastorino	2011-06-25	2	-1/+8
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Get the fixture_path from self.class instead of ActiveSupport::TestCase.
\| * \| \| \|	Get the fixture_path from self.class instead of ActiveSupport::TestCase.	David Chelimsky	2011-06-25	2	-1/+8
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows test classes that are not subclasses of ActiveSupport::TestCase (like those in rspec-rails) to interact with with this variable without having to reference ActiveSupport::TestCase.