David Heinemeier Hansson
fbe387ea25
Merge branch 'master' of git@github.com:rails/rails
2008-11-01 15:04:28 +01:00
Luca Guidi
5229fc4cc0
Make sure habtm use class variable to list association valid keys
...
Signed-off-by: Michael Koziarski <michael@koziarski.com >
[#1310 state:committed]
2008-11-01 15:04:08 +01:00
Luca Guidi
3f6653f9fd
Make sure habtm use class variable to list association valid keys
...
Signed-off-by: Michael Koziarski <michael@koziarski.com >
[#1310 state:committed]
2008-11-01 12:25:29 +01:00
David Heinemeier Hansson
5110a8e05b
Remove the logging of the Session ID when the session store is CookieStore [DHH]
2008-11-01 12:16:15 +01:00
David Heinemeier Hansson
aea7e8c2f3
Accidently nixed a doc header
2008-11-01 12:05:55 +01:00
David Heinemeier Hansson
cbeac93310
Added render :js for people who want to render inline JavaScript replies without using RJS [DHH]
2008-11-01 12:03:49 +01:00
Jeffrey Hardy
408c722757
Really silence spec warnings when running GemDependency tests [ #1308 state:resolved]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com >
2008-10-31 18:45:36 +01:00
David Heinemeier Hansson
c50667e961
Merge branch 'master' of git@github.com:rails/rails
2008-10-31 18:41:45 +01:00
David Heinemeier Hansson
e466ae13e9
Fixed the option merging in Array#to_xml [ #1126 state:resolved]
2008-10-31 18:41:25 +01:00
Joshua Peek
fc215de52f
Revert "config.load_paths should be frozen [ #728 state:resolved]"
...
This reverts commit 2dcdcf1552 .
2008-10-30 16:28:23 -05:00
Joshua Peek
4df5e1ae8f
It is not necessary to store QueryCache in a thread local since the cache is local to the connection object which is managed by the connection pool
2008-10-30 16:27:13 -05:00
Joshua Peek
2dcdcf1552
config.load_paths should be frozen [ #728 state:resolved]
2008-10-30 15:52:12 -05:00
Joshua Peek
0c84b6f9ed
Use database name in query cache thread local key [ #1283 state:resolved]
2008-10-30 15:48:03 -05:00
Joshua Peek
2092687bcb
Ensure content type gets reset after render_to_string [ #1182 state:resolved]
2008-10-30 15:26:29 -05:00
David Heinemeier Hansson
7857e42103
Merge branch 'master' of git@github.com:rails/rails
2008-10-30 21:11:46 +01:00
Seth Fitzsimmons
47b4fa4a62
Fixed regex in redirect_to to fully support URI schemes [ #1247 state:committed]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com >
2008-10-30 21:07:50 +01:00
Joshua Peek
ec38c84ce1
Dup local assigns for partial collections so nil values doesn't get overwritten [ #1250 state:resolved]
2008-10-30 15:07:47 -05:00
Tarmo Tänav
ef53d91516
Don't rely on string CoreExtensions in StringInquirer since it is sometimes expected to work before the core extension are loaded
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com >
2008-10-30 17:48:32 +01:00
Jordi Bunster
a9e8168432
Ensure indices don't flip order in schema.rb [ #1266 state:committed]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com >
2008-10-30 13:03:42 +01:00
Mathias Meyer
7418d367f0
Fixed plugin generator so that generated unit tests would subclass ActiveSupport::TestCase, also introduced a helper script to reduce the needed require statements. [ #1137 state:committed]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com >
2008-10-30 12:57:52 +01:00
David Heinemeier Hansson
dffc2e2b64
Fixed that ActiveResource#post would post an empty string when it shouldn't be posting anything (Paolo Angelini) [ #525 state:committed]
2008-10-30 12:47:23 +01:00
David Heinemeier Hansson
ea2545fd8d
Update the default deprecation message to not promise that theres more info at the Rails site [ #776 state:resolved]
2008-10-30 12:42:23 +01:00
David Heinemeier Hansson
a4b4463fca
Merge branch 'master' of git@github.com:rails/rails
2008-10-30 12:15:58 +01:00
Christopher Currie
f8f22dac8e
Update non-gems distributions to use sqlite3 as the default, matching the "rails" command default [ #1270 status:committed]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com >
2008-10-30 12:15:42 +01:00
Luca Guidi
47007c75af
Update prototype to 1.6.0.3
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com >
2008-10-30 12:14:26 +01:00
Luca Guidi
a01f9f0723
Update prototype to 1.6.0.3
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com >
2008-10-30 12:01:30 +01:00
David Heinemeier Hansson
8f0f078637
Make #destroy write 1 line into log (instead of 3) (Dmitry Sokurenko) [ #689 status:committed]
2008-10-29 10:53:33 +01:00
David Heinemeier Hansson
4dbfe18b37
Proper API for reloading translations
2008-10-29 10:51:56 +01:00
Ryan Bates
4ad5aa9a39
Ensure @content_for_* is checked before yielding to block in render :layout [ #8994 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2008-10-28 17:31:33 -05:00
Michael Koziarski
4684e76aef
Remove reload call from vendored gem. Breaks a bunch of stuff as Dispatcher isn't always defined.
...
This call will be moved into Dispatcher in a bit.
2008-10-28 21:55:59 +01:00
David Heinemeier Hansson
1b0afb31df
A few more style changes
2008-10-28 19:38:26 +01:00
David Heinemeier Hansson
d5b0ba6632
Make I18n::Backend::Simple reload its translations in development mode [DHH]
2008-10-28 19:28:51 +01:00
David Heinemeier Hansson
a61c4dfa70
Follow style conventions
2008-10-28 18:35:12 +01:00
David Heinemeier Hansson
1df157cd38
Merge branch 'master' of git@github.com:rails/rails
2008-10-28 17:10:52 +01:00
Joshua Peek
ac50ee0edf
Track rendered templates in stack so the current template can always be accessed. Added ActionView::Base#template to access the template object.
2008-10-28 11:06:08 -05:00
David Heinemeier Hansson
3e54a9a689
A little less hokus pokus
2008-10-28 16:51:08 +01:00
Joshua Peek
0f651aec4e
Thread Safety: Ensure recognize_optimized is immediately written instead of lazily
2008-10-27 12:34:54 -05:00
David Heinemeier Hansson
c94ba8150a
Fixed that serialized strings should never be type-casted (i.e. turning "Yes" to a boolean)(Andreas Korth) [ #857 state:committed]
2008-10-27 17:16:45 +01:00
Michael Koziarski
9e2bb2caff
Remove reference to fformat to restore support for postgres gem.
2008-10-26 20:04:09 +01:00
Erik Andrejko
ef9b6b5cba
modified current_page? to ignore extra parameters unless specified in options
...
Signed-off-by: Michael Koziarski <michael@koziarski.com >
[#805 state:committed]
2008-10-26 19:14:45 +01:00
David Heinemeier Hansson
2c7abe1b56
Fixed bug with asset timestamping when using relative_url_root (Joe Goldwasser) [ #1265 status:committed]
2008-10-26 16:50:18 +01:00
Adam Majer
932dffc559
Fix binary data corruption bug in PostgreSQL adaptor
...
1. Move the binary escape/unescape from column to the driver - we should store binary data AR just like most other adaptors
2. check to make sure we only unescape bytea data
PGresult.ftype( column ) == 17
that is passed to us in escaped format
PGresult.fformat( column ) == 0
Signed-off-by: Michael Koziarski <michael@koziarski.com >
[#1063 state:committed]
2008-10-25 12:54:48 +02:00
Mike Gunderloy
5c97d4ff29
"raise NoMethodError" raises NoMethodError. Raise it with NoMethodError.new instead.
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com >
2008-10-25 14:52:44 +05:30
Pratik Naik
5cf932344a
Fix typos in release notes
2008-10-25 04:34:09 +05:30
Pratik Naik
559178b80d
Update guides and release notes
2008-10-25 03:43:38 +05:30
Ken Miller
8a77c4abfa
Fixed issue where block is not called on the very first invocation of a find_or_create_by_ automatic finder.
...
[#1224 state:committed]
2008-10-24 21:35:05 +02:00
Pratik Naik
a17fc20eb1
Fix a typo
v2.2.0
2008-10-24 18:05:52 +05:30
Pratik Naik
f8079b815b
Add some more info to the release notes
2008-10-24 18:00:01 +05:30
David Heinemeier Hansson
d224e6ccb1
Update CHANGELOGs with the last few fixes, set date for today
2008-10-24 13:08:47 +02:00
Jeffrey Hardy
3bcadc9290
Fix incorrect closing CDATA delimiter. Add tests for CDATA nodes.
...
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net >
2008-10-23 19:16:26 -07:00