Santiago Pastorino
35cdd256c0
Master version is 3.2.0.beta
2011-06-30 10:18:36 -03:00
Santiago Pastorino
a2a7a19d26
Bump up rack-cache and tzinfo
2011-06-30 10:07:26 -03:00
Santiago Pastorino
20ffd43ab4
Allow CI to use the latest rubygems version
2011-06-30 08:32:53 -03:00
Santiago Pastorino
452922a359
Update CI config
2011-06-30 08:26:25 -03:00
José Valim
f34f0b7e08
Add has_key? and key? methods to CookieJar removed in 0ca69ca65f83b4bb34f8
2011-06-30 08:01:53 -03:00
José Valim
d1b6188316
Merge pull request #1690 from vijaydev/mattr_accessor_changes
...
Added instance_accessor: false to Module#mattr_accessor
2011-06-30 03:50:47 -07:00
Santiago Pastorino
539752a54c
Move Coffee generators and templates to Coffee Railtie and create javascript_engine ("js") for apps that remove Coffee gem
2011-06-29 21:16:09 -03:00
Jon Leighton
4d256bc6b1
CommandRecorder should delegate in method_missing where possible. Fixes some tests in migration_test.rb under mysql. The problem was introduced in c278a2c5e109204ec8a47fcbfdfc327aad7996ce.
2011-06-30 00:47:35 +01:00
Jon Leighton
b4d8c7d148
Array.wrap should follow Kernel#Array semantics when the object's to_ary is nil. In this case, the object should be wrapped.
2011-06-30 00:21:42 +01:00
Jon Leighton
e9fa602e1c
Define to_ary on ActiveRecord::Base to return nil. Improve performance of Array#flatten under 1.9, see comment for details.
2011-06-30 00:20:54 +01:00
Xavier Noria
9378d7e213
sub suffices here
2011-06-29 23:46:58 +02:00
Aaron Patterson
1d43409d32
Revert "Delegate to @flashes with 'delegate' instead of manually."
...
This reverts commit 701e8554a8f69b0c81fe794cba985bfda804161b.
2011-06-29 13:52:44 -07:00
José Valim
3dedf5f0e2
Merge pull request #1909 from r00k/master
...
Use 'delegate' macro instead of writing out methods by hand
2011-06-29 12:34:16 -07:00
Ben Orenstein
701e8554a8
Delegate to @flashes with 'delegate' instead of manually.
2011-06-29 15:16:57 -04:00
José Valim
c49d1f2b26
Merge pull request #1899 from ihower/patch_rake_test
...
Make "rake test" display not only task name but also exception message.
2011-06-29 10:01:13 -07:00
José Valim
d677097eb6
Fix configurable cristalization and tests.
2011-06-29 13:57:59 -03:00
Wen-Tien Chang
db87e48b5e
Add test to rake test for error messages
2011-06-30 00:09:00 +08:00
José Valim
c690b7124d
[IMPORTANT] Make "sprockets/railtie" require explicit.
...
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.
2011-06-29 09:41:16 -03:00
José Valim
4106245530
Merge pull request #1897 from istewart/active_model_dirty_patch
...
ActiveModel::Dirty patch for multiple assignments to the same attribute
2011-06-29 02:48:55 -07:00
Wen-Tien Chang
89ad0629e0
Make "rake test" display not only task name but also exception message.
2011-06-29 17:15:55 +08:00
Ian Stewart
eafa174bfd
changing an attribute multiple times retains the correct original value
2011-06-28 22:18:24 -07:00
Aaron Patterson
31536855ae
Merge pull request #1883 from arunagw/time_zone_fix
...
Using not effected timezone in tests.
2011-06-28 16:53:33 -07:00
Santiago Pastorino
ff9566caf2
Merge pull request #1886 from arunagw/fix_test_for_jruby_db
...
fix test when running Jruby. If Jruby Platform is available the gem will
2011-06-28 14:59:38 -07:00
Aaron Patterson
59e38803e9
Merge pull request #1574 from oriolgual/1571_ar_relation_order_no_longer_works_with_arel_nodes
...
Fix #1571 ActiveRecord::Relation#order no longer works with arel ordering nodes
2011-06-28 14:55:15 -07:00
Arun Agrawal
2b046e7c39
fix test when running Jruby. If Jruby Platform is available the gem will change.
2011-06-29 02:41:52 +05:30
Aaron Patterson
931cf17c33
Merge pull request #1882 from rsim/fix_test_finding_with_cross_table_order_and_limit
...
Fix test_finding_with_cross_table_order_and_limit for Oracle
2011-06-28 13:48:53 -07:00
Oriol Gual
56ac32ad51
Fix case
2011-06-28 22:31:24 +02:00
Oriol Gual
2e0840dd04
Update reverse order with new Arel Nodes
2011-06-28 22:22:26 +02:00
Arun Agrawal
cd48bd2478
Using not effected timezone in tests.
2011-06-29 01:47:56 +05:30
Oriol Gual
eb933f0154
Add more test cases
2011-06-28 22:10:51 +02:00
Oriol Gual
e174923d29
Add failing test
2011-06-28 22:10:50 +02:00
Raimonds Simanovskis
f838b47b87
Fix test_finding_with_cross_table_order_and_limit for Oracle
...
Use latest Arel syntax and pass each order by expression as separate argument to order method as otherwise invalid Oracle SQL is generated.
2011-06-28 23:04:42 +03:00
Aaron Patterson
941d5c1f40
Merge pull request #1857 from vijaydev/irreversible-migration
...
IrreversibleMigration is not raised when a method not supported by reversible migrations is called in the change method of a migration
2011-06-28 12:05:19 -07:00
Aaron Patterson
a5cb5a5af6
Merge pull request #1860 from dmathieu/comparison
...
Allow comparison on model objects - Closes #1858
2011-06-28 11:46:25 -07:00
Aaron Patterson
26caf32949
remove useless assignment
2011-06-28 10:57:56 -07:00
Aaron Patterson
13e79eb6c3
lock_optimistically is typically true, so evaluate the common failure case first
2011-06-28 10:51:23 -07:00
Aaron Patterson
02f45d6e0c
reduce object allocation during AR instantiation
2011-06-28 10:22:39 -07:00
José Valim
c290900a77
Merge pull request #1878 from arunagw/mime_test_fix
...
Removing image/gif from this test.
2011-06-28 05:55:50 -07:00
Arun Agrawal
8c1f62acda
No need to register again. As it's default now.
...
Removing gif from here because when it got unregister it start failing other places.
2011-06-28 18:20:28 +05:30
José Valim
71d7c52019
Update railties.gemspec
2011-06-28 09:35:46 -03:00
José Valim
e3053ee753
Copy the bin to railties so it also works if you don't have the rails gem.
2011-06-28 09:09:46 -03:00
José Valim
0a873627e4
Merge pull request #1877 from arunagw/fix_mime
...
Fix test to use Mime::Zip
2011-06-28 04:58:29 -07:00
Arun Agrawal
1b957177e7
Fix test to use Mime::Zip
2011-06-28 16:51:19 +05:30
José Valim
76581d0f1b
Edited actionpack/CHANGELOG via GitHub
2011-06-28 02:45:27 -07:00
José Valim
4f372cf4d9
Merge pull request #1875 from esad/master
...
Fixed issue #1847
2011-06-28 02:44:04 -07:00
Esad Hajdarevic
2a61d47b55
Make send_file guess content-type from file extension, if type wasn't supplied (Issue #1847 ). Update tests & documentation.
2011-06-28 06:58:28 +02:00
Esad Hajdarevic
d73269ba53
Register some commonly used mime types (png, jpeg, pdf, zip etc.) per default
2011-06-28 06:56:47 +02:00
Aaron Patterson
9921eca51c
remove the check for needs_type_condition? because ensure_proper_type will pick up the type column
2011-06-27 20:44:39 -07:00
Aaron Patterson
4006e738ed
stop using && for the short circuit side effect
2011-06-27 18:16:01 -07:00
Aaron Patterson
4ec47cac10
let strings be converted to symbols inside the interpreter
2011-06-27 18:15:28 -07:00