U-ESCAPEE\Mack
|
f3f7d166d8
|
Fixed problem causes by leftover backup templates ending in tilde [state:committed #969]
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
|
2008-09-09 23:29:29 -05:00 |
|
David Heinemeier Hansson
|
704fc3785e
|
No local variable in the global namespace plz
|
2008-09-09 23:13:37 -05:00 |
|
David Heinemeier Hansson
|
23a0e2c4a9
|
Fixed that REXML fix would break on earlier versions of ruby (Frederick Cheung) [state:resolved #987]
|
2008-09-09 23:07:34 -05:00 |
|
David Heinemeier Hansson
|
cc17863709
|
Revert "Remove the Version check as it's not always available."
This reverts commit 6e2851d426.
|
2008-09-09 23:05:09 -05:00 |
|
David Heinemeier Hansson
|
c5b65b4905
|
Only separate loggings with a comma when there are actually two statements
|
2008-09-09 22:42:49 -05:00 |
|
David Heinemeier Hansson
|
6233628ba0
|
Stopped logging template compiles as it only clogs up the log
|
2008-09-09 22:10:39 -05:00 |
|
David Heinemeier Hansson
|
dc8b21dc3c
|
Dont reference the class being tested when it can be assumed
|
2008-09-09 17:59:34 -05:00 |
|
David Heinemeier Hansson
|
6228220c9b
|
Revert "Revert "Add layout functionality to mailers.""
This reverts commit 36c6aa01ee.
|
2008-09-09 17:25:09 -05:00 |
|
David Heinemeier Hansson
|
36c6aa01ee
|
Revert "Add layout functionality to mailers."
This reverts commit e9a8e0053b.
|
2008-09-09 17:20:55 -05:00 |
|
Hongli Lai (Phusion)
|
1398db0128
|
Add special AssociationReflection methods for creating association objects, and modify the code base to use those methods instead of creating association objects directly. This allows plugins to hook into association object creation behavior.
[#986 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
|
2008-09-09 13:13:12 -07:00 |
|
Hongli Lai (Phusion)
|
1692940441
|
Make the options that has_many, belongs_to and other association generation methods can accept, configurable.
[#985 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
|
2008-09-09 12:50:32 -07:00 |
|
Michael Koziarski
|
07913788f9
|
Interpolation requires double quotes
|
2008-09-09 21:16:06 +02:00 |
|
Akira Matsuda
|
5f7c42413b
|
Ruby 1.9 compat: remove instance variables and global variables from block parameters
[#1000 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
|
2008-09-09 10:35:53 -07:00 |
|
Akira Matsuda
|
8e68ec4dcc
|
Ruby 1.9 compat: use String#lines instead of to_a in Ruby 1.9
[#1001 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
|
2008-09-09 10:35:24 -07:00 |
|
Akira Matsuda
|
07eb9ffd15
|
Ruby 1.9 compat: remove constants from block parameters
[#1002 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
|
2008-09-09 10:07:59 -07:00 |
|
Jeremy Kemper
|
d5893a517f
|
Merge branch 'master' of git@github.com:rails/rails
|
2008-09-09 09:49:33 -07:00 |
|
Michael Koziarski
|
6e2851d426
|
Remove the Version check as it's not always available.
|
2008-09-09 10:38:07 +02:00 |
|
Jeremy Kemper
|
dc0411fad7
|
Check for uninitialized instance variables
|
2008-09-08 19:57:32 -07:00 |
|
Jeremy Kemper
|
8b4461c1a4
|
Check whether memoized ivar is initialized
|
2008-09-08 19:43:52 -07:00 |
|
Jeremy Kemper
|
fd71a1a354
|
Remove recognized_optimized method before redefining it
|
2008-09-08 19:42:20 -07:00 |
|
Jeremy Kemper
|
3c658512a1
|
Use defined? check since @view_paths may be uninitialized
|
2008-09-08 19:41:57 -07:00 |
|
Jeremy Kemper
|
1b94d5dc65
|
Fix indentation mismatch
|
2008-09-08 18:10:23 -07:00 |
|
Jeremy Kemper
|
dc0aed1151
|
Don't shadow arg with block var
|
2008-09-08 18:08:48 -07:00 |
|
Jeremy Kemper
|
621f48edb2
|
BigDecimal to_s and yaml housekeeping
|
2008-09-08 18:06:58 -07:00 |
|
Jeremy Kemper
|
4f6875296f
|
Revert "Revert "Raise UnknownAttributeError when unknown attributes are supplied via mass assignment""
This reverts commit 41efd73887.
|
2008-09-08 09:45:26 -07:00 |
|
Matt Jones
|
7e6cda15f8
|
Ensure routing optimizations are cleared when new routes are added [#981 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
|
2008-09-07 10:21:34 -05:00 |
|
Jeremy Kemper
|
41efd73887
|
Revert "Raise UnknownAttributeError when unknown attributes are supplied via mass assignment"
This reverts commit 108db00aa9.
|
2008-09-06 21:01:45 -07:00 |
|
Jeremy Kemper
|
15b1b2b778
|
Ruby 1.9 compat: use method_defined? instead of instance_methods.include? Don't encourage args abuse by flattening.
|
2008-09-06 18:45:52 -07:00 |
|
David Heinemeier Hansson
|
227ee2ecb4
|
Use a more sensible resolution on the new millisecond benchmarks
|
2008-09-05 14:58:34 +02:00 |
|
David Heinemeier Hansson
|
de0e7507de
|
Changed all benchmarking reports to be in milliseconds
|
2008-09-05 14:22:57 +02:00 |
|
David Heinemeier Hansson
|
cf0467c642
|
Use copy instead of export for release
|
2008-09-05 14:22:56 +02:00 |
|
Jeremy Kemper
|
1156bbc06c
|
Merge branch 'master' of git@github.com:rails/rails
|
2008-09-04 17:20:24 +02:00 |
|
Jeremy Kemper
|
cd498e2588
|
Rescue spurious failures in case dummy postgresql user or schema already exists
|
2008-09-04 17:20:07 +02:00 |
|
Michael Koziarski
|
ca5ffd10b9
|
Handle connection timeouts with a slightly nicer error message.
|
2008-09-04 17:02:04 +02:00 |
|
Jeremy Kemper
|
17628ecfce
|
Deprecate %d and %s in message interpolation, but only in the bundled i18n lib.
|
2008-09-04 16:46:12 +02:00 |
|
Nick Sieger
|
0d9e238cc9
|
Remove flawed execute("ROLLBACK") approach; #reset! defaults to nothing
Will need community help to fill out what #reset! should do for each adapter
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
|
2008-09-04 15:45:00 +02:00 |
|
Nick Sieger
|
a3f12f575d
|
Default connection allow_concurrency to false (for PostgreSQL)
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
|
2008-09-04 15:44:05 +02:00 |
|
Michael Koziarski
|
2c62baf4bf
|
Handle the case where there is no ivar set.
This happens on jruby due to a bug, but also on historically marshalled data.
|
2008-09-04 15:09:30 +02:00 |
|
Nick Sieger
|
7ba2872615
|
Deprecate verification_timeout and verify before reset
Signed-off-by: Michael Koziarski <michael@koziarski.com>
|
2008-09-04 14:36:09 +02:00 |
|
Jeremy Kemper
|
f54be2cb31
|
Fix transaction exception test
|
2008-09-04 13:24:55 +02:00 |
|
Jeremy Kemper
|
039d78a7d8
|
still need to track whether we're the toplevel transaction
|
2008-09-04 13:17:00 +02:00 |
|
Jeremy Kemper
|
045713ee24
|
PostgreSQL: introduce transaction_active? rather than tracking activity ourselves
|
2008-09-04 12:17:56 +02:00 |
|
Tarmo Tänav
|
671bbd962e
|
Don't run 32bit dependant assertions in 64bit environments
Signed-off-by: Michael Koziarski <michael@koziarski.com>
|
2008-09-04 10:11:06 +02:00 |
|
Pratik Naik
|
6ef35461dc
|
Merge docrails
|
2008-09-03 17:58:47 +01:00 |
|
Adam Keys
|
10fe6a6d89
|
Add each_with_object from 1.9 for a more convenient alternative to inject.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#962 state:committed]
|
2008-09-03 16:21:53 +02:00 |
|
Nigel Ramsay
|
b36d000975
|
Inline help text was incorrectly telling user to uncomment line to use default local time. User should comment the line to use default local time.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#960 state:committed]
|
2008-09-03 09:04:42 +02:00 |
|
Clemens Kofler
|
d3ccfe414d
|
Whitespace.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
|
2008-09-03 00:55:55 +02:00 |
|
Clemens Kofler
|
288e947ae1
|
Some performance goodness for inheritable attributes.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
|
2008-09-03 00:55:23 +02:00 |
|
Clemens Kofler
|
4d092ba208
|
Some performance goodness for AR.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
|
2008-09-03 00:55:23 +02:00 |
|
Clemens Kofler
|
a377c9853c
|
Some performance goodness for AM Validations.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
|
2008-09-03 00:55:23 +02:00 |
|