Joshua Peek
104898fcb7
Revert to the good old days when AssetTag didn't cause anyone problems
2009-01-02 13:40:23 -06:00
Laszlo Bacsi
606176a55b
Fixed call_with_exception for Routing Errors [ #1684 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-01-02 10:46:48 -06:00
ddemaree
f90160c6c1
Fixed bug where calling app method from console would raise ArgumentError [ #1629 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-01-02 10:31:21 -06:00
David Heinemeier Hansson
a1fb57aa69
Added :silence option to BenchmarkHelper#benchmark and turned log_level into a hash parameter and deprecated the old use [DHH]
2009-01-01 18:53:16 +01:00
David Heinemeier Hansson
f1e20ce9a7
Merge branch 'master' of git@github.com:rails/rails
2009-01-01 18:13:14 +01:00
David Heinemeier Hansson
49a055dff6
Fixed the AssetTagHelper cache to use the computed asset host as part of the cache key instead of just assuming the its a string [ #1299 state:committed]
2009-01-01 18:12:49 +01:00
Jeremy Kemper
a5004573d8
Only silence backtrace from plugin lib dirs
2008-12-30 18:25:44 -08:00
Jeremy Kemper
2e1132fad8
Test that exceptions raised in filters are properly rescued
2008-12-30 18:06:56 -08:00
Jeremy Kemper
c69d8c043f
Fix formatted_* deprecation message
2008-12-30 15:16:51 -08:00
Jeremy Kemper
2f9edde142
Clean trailing / after rails root from backtraces
2008-12-30 12:44:31 -08:00
Jeremy Kemper
d961592886
Merge branch 'master' of git@github.com:rails/rails
2008-12-30 12:40:32 -08:00
Pratik Naik
82443ecfad
Merge commit 'fred/pullable'
2008-12-30 17:50:17 +00:00
Mike Gunderloy
a29369ae4a
Fix named scope tests for sqlite3 [ #1667 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-12-30 03:10:11 +00:00
Mike Gunderloy
220dff4c3b
Add transaction check to SQLite2 adapter to fix test_sqlite_add_column_in_transaction_raises_statement_invalid [ #1669 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-12-30 03:07:30 +00:00
Joshua Peek
558ab327b7
Clean up view path cruft and split path implementations into Template::Path and Template::EagerPath
2008-12-29 19:27:19 -06:00
Jeremy Kemper
276ec16007
Merge branch 'master' of git@github.com:rails/rails
2008-12-29 14:38:54 -08:00
Mike Gunderloy
490c26c843
Fix failing gem dependency tests [ #1659 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-12-29 20:00:47 +00:00
Mike Gunderloy
36af857c43
Fix FCGI dispatching tests
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-12-29 19:58:10 +00:00
Joshua Peek
c20c72e3d9
Use rack namespace for routing args
2008-12-28 15:34:59 -06:00
Joshua Peek
5d89605c11
Make router and controller classes better rack citizens
2008-12-28 15:31:03 -06:00
Joshua Peek
45dee3842d
HTTP Digest authentication [ #1230 state:resolved]
2008-12-28 15:13:16 -06:00
Joshua Peek
1f0aecd931
Allow custom rails generators to pass in their own binding to Create command so that the corresponding erb templates get rendered with the proper binding [ #1493 state:resolved]
2008-12-28 15:10:41 -06:00
Joshua Peek
1e45818a62
Allow multiple conditions for callbacks [ #1627 state:resolved]
2008-12-28 15:07:17 -06:00
Yaroslav Markin
3b92b141fd
Fix 'i18n' require broken by 0.0.1 -> 0.1.1 commit [ #1658 state:committed]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2008-12-28 21:34:57 +01:00
Yaroslav Markin
1648df79b7
Update i18n gem to version 0.1.1 (Rails' changes were backported) [ #1635 state:committed]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2008-12-28 21:19:27 +01:00
David Heinemeier Hansson
0efec64520
Merge branch 'master' of git@github.com:rails/rails
2008-12-28 20:53:58 +01:00
Yaroslav Markin
66ee5890c5
Introduce dynamic scopes for ActiveRecord: you can now use class methods like scoped_by_user_name(user_name) and scoped_by_user_name_and_password(user_name, password) that will use the scoped method with attributes you supply. [ #1648 state:committed]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2008-12-28 20:52:46 +01:00
Xavier Noria
a2270ef259
Inline code comments for class_eval/module_eval [ #1657 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-12-28 19:49:28 +00:00
Mike Gunderloy
1fb275541a
Ensure template runner tests don't depend on hash ordering [ #1654 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-12-28 17:49:58 +00:00
Pratik Naik
fec0ea9d6d
Request#env['SERVER_NAME'] does not contain port number
2008-12-28 17:07:13 +00:00
Aaron Quint
c0c79f779c
Use SimpleLogger for Rails::TemplateRunner outside of the Generator context [ #1618 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-12-28 16:49:19 +00:00
Mark Reginald James
5138f755ff
Fixed incorrect parsing of query parameters with mixed-depth nesting inside an array [ #1622 state:resolved]
...
Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
2008-12-28 01:15:48 +00:00
Aaron Quint
9fd35fc2d8
Adding test coverage and better logging to Rails::TemplateRunner [ #1618 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-12-27 21:03:44 +00:00
Yaroslav Markin
fdaa9ed033
Fix ActionPack build on Windows: we really should not test anything regarding symlinks on Windows.
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-12-27 17:33:13 +00:00
Yaroslav Markin
28347d889b
Refactor ActiveRecord::Base#new_record? [ #1647 state:committed]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2008-12-27 15:25:39 +01:00
Frederick Cheung
afdec83ed5
Fix to_sentence being used with options removed by 273c77
2008-12-27 14:16:17 +00:00
Yaroslav Markin
6e98adfc8e
ActiveRecord::Base#new_record? now returns false for existing records (was nil) [ #1219 state:committed]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2008-12-27 14:36:11 +01:00
Yehuda Katz
4f043a4838
More optimizations on respond_to after a profile and benching:
...
App with simple respond_to:
def index
respond_to do |format|
format.html
format.xml
format.json
end
end
On JRuby (after complete hotspot warmup) -- 8% improvement:
550 requests per second after this commit
510 requests per second with old method_missing technique
On MRI (8% improvement):
430 requests per second after this commit
400 requests per second with old method_missing technique
2008-12-27 00:06:57 -08:00
Roman Shterenzon
21efba464a
Fix HasManyAssociation#create ignoring the :primary_key option [ #1633 state:resolved]
...
Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
2008-12-27 01:10:29 +00:00
Frederick Cheung
f9cab0e503
Fix :include of has_one with :primary_key option
2008-12-26 23:26:37 +00:00
Frederick Cheung
7db1704068
Fix :include of has_many associations with :primary_key option
2008-12-26 23:17:56 +00:00
Pratik Naik
f4f8923cf0
Merge commit 'fred/pullable'
2008-12-26 21:56:21 +00:00
Yehuda Katz
6dc1288111
Remove method missing use in respond_to
2008-12-26 13:41:02 -08:00
Frederick Cheung
5cebe69e74
Preload uses exclusive scope [ #643 state:resolved]
...
With self referential associations, the scope for the the top level should not affect fetching of associations, for example
when doing
Person.male.find :all, :include => :friends
we should load all of the friends for each male, not just the male friends.
2008-12-26 18:25:55 +00:00
Pivotal Labs
eb457ceee1
Association preloading no longer stops if it hits a nil object [ #1630 state:resolved]
...
Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
2008-12-26 18:25:50 +00:00
trans
c9d4335418
MaKe Hash#slice! return removed values, akin to Array [ #971 state:resolved]
...
Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
2008-12-26 18:25:42 +00:00
Frederick Cheung
dce0da77e7
Fix assert_select_rjs not checking id for inserts [ #540 state:resolved]
2008-12-26 18:25:32 +00:00
Frederick Cheung
d7b6e48c70
Fix randomly failing cookie store tests
...
Marshal.dump(Marshal.load(marshaled_hash)) is not guarenteed to be equal to marshaled_hash
because of the lack of ordering of hash
2008-12-26 18:25:03 +00:00
Pratik Naik
db5a98e6cb
Merge docrails
2008-12-26 17:19:59 +00:00
Pratik Naik
07298fd092
Don't recurse when ActionController#render is called without any arguments
2008-12-26 01:49:14 +00:00