Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Revert "Add layout functionality to mailers." | David Heinemeier Hansson | 2008-09-09 | 9 | -115/+3 | |
| | | | | This reverts commit e9a8e0053be3b293ab89fb584f1d660063f107aa. | |||||
* | Add special AssociationReflection methods for creating association objects, ↵ | Hongli Lai (Phusion) | 2008-09-09 | 7 | -16/+62 | |
| | | | | | | | | 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> | |||||
* | Make the options that has_many, belongs_to and other association generation ↵ | Hongli Lai (Phusion) | 2008-09-09 | 2 | -18/+32 | |
| | | | | | | | | methods can accept, configurable. [#985 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Interpolation requires double quotes | Michael Koziarski | 2008-09-09 | 1 | -1/+1 | |
| | ||||||
* | Ruby 1.9 compat: remove instance variables and global variables from block ↵ | Akira Matsuda | 2008-09-09 | 1 | -8/+8 | |
| | | | | | | | | parameters [#1000 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Ruby 1.9 compat: use String#lines instead of to_a in Ruby 1.9 | Akira Matsuda | 2008-09-09 | 1 | -1/+1 | |
| | | | | | | [#1001 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Ruby 1.9 compat: remove constants from block parameters | Akira Matsuda | 2008-09-09 | 2 | -2/+3 | |
| | | | | | | [#1002 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-09-09 | 1 | -22/+20 | |
|\ | ||||||
| * | Remove the Version check as it's not always available. | Michael Koziarski | 2008-09-09 | 1 | -22/+20 | |
| | | ||||||
* | | Check for uninitialized instance variables | Jeremy Kemper | 2008-09-08 | 4 | -20/+24 | |
| | | ||||||
* | | Check whether memoized ivar is initialized | Jeremy Kemper | 2008-09-08 | 1 | -1/+1 | |
| | | ||||||
* | | Remove recognized_optimized method before redefining it | Jeremy Kemper | 2008-09-08 | 1 | -2/+15 | |
| | | ||||||
* | | Use defined? check since @view_paths may be uninitialized | Jeremy Kemper | 2008-09-08 | 1 | -1/+5 | |
|/ | ||||||
* | Fix indentation mismatch | Jeremy Kemper | 2008-09-08 | 3 | -3/+3 | |
| | ||||||
* | Don't shadow arg with block var | Jeremy Kemper | 2008-09-08 | 1 | -2/+2 | |
| | ||||||
* | BigDecimal to_s and yaml housekeeping | Jeremy Kemper | 2008-09-08 | 1 | -22/+18 | |
| | ||||||
* | Revert "Revert "Raise UnknownAttributeError when unknown attributes are ↵ | Jeremy Kemper | 2008-09-08 | 2 | -1/+17 | |
| | | | | | | supplied via mass assignment"" This reverts commit 41efd73887c00ffd228b05d9346ec47a1f3759b9. | |||||
* | Ensure routing optimizations are cleared when new routes are added [#981 ↵ | Matt Jones | 2008-09-07 | 3 | -2/+41 | |
| | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
* | Revert "Raise UnknownAttributeError when unknown attributes are supplied via ↵ | Jeremy Kemper | 2008-09-06 | 2 | -17/+1 | |
| | | | | | | mass assignment" This reverts commit 108db00aa90fe266564483ab301cf0669cae600f. | |||||
* | Ruby 1.9 compat: use method_defined? instead of instance_methods.include? ↵ | Jeremy Kemper | 2008-09-06 | 1 | -3/+6 | |
| | | | | Don't encourage args abuse by flattening. | |||||
* | Use a more sensible resolution on the new millisecond benchmarks | David Heinemeier Hansson | 2008-09-05 | 5 | -11/+11 | |
| | ||||||
* | Changed all benchmarking reports to be in milliseconds | David Heinemeier Hansson | 2008-09-05 | 8 | -32/+60 | |
| | ||||||
* | Use copy instead of export for release | David Heinemeier Hansson | 2008-09-05 | 1 | -2/+5 | |
| | ||||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-09-04 | 1 | -1/+1 | |
|\ | ||||||
| * | Handle connection timeouts with a slightly nicer error message. | Michael Koziarski | 2008-09-04 | 1 | -1/+1 | |
| | | ||||||
* | | Rescue spurious failures in case dummy postgresql user or schema already exists | Jeremy Kemper | 2008-09-04 | 1 | -2/+2 | |
| | | ||||||
* | | Deprecate %d and %s in message interpolation, but only in the bundled i18n lib. | Jeremy Kemper | 2008-09-04 | 1 | -2/+7 | |
|/ | ||||||
* | Remove flawed execute("ROLLBACK") approach; #reset! defaults to nothing | Nick Sieger | 2008-09-04 | 2 | -5/+1 | |
| | | | | | | Will need community help to fill out what #reset! should do for each adapter Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Default connection allow_concurrency to false (for PostgreSQL) | Nick Sieger | 2008-09-04 | 4 | -2/+20 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Handle the case where there is no ivar set. | Michael Koziarski | 2008-09-04 | 1 | -1/+1 | |
| | | | | This happens on jruby due to a bug, but also on historically marshalled data. | |||||
* | Deprecate verification_timeout and verify before reset | Nick Sieger | 2008-09-04 | 5 | -19/+18 | |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
* | Fix transaction exception test | Jeremy Kemper | 2008-09-04 | 1 | -0/+1 | |
| | ||||||
* | still need to track whether we're the toplevel transaction | Jeremy Kemper | 2008-09-04 | 1 | -3/+10 | |
| | ||||||
* | PostgreSQL: introduce transaction_active? rather than tracking activity ↵ | Jeremy Kemper | 2008-09-04 | 1 | -0/+32 | |
| | | | | ourselves | |||||
* | Don't run 32bit dependant assertions in 64bit environments | Tarmo Tänav | 2008-09-04 | 1 | -4/+10 | |
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
* | Merge docrails | Pratik Naik | 2008-09-03 | 23 | -199/+312 | |
| | ||||||
* | Add each_with_object from 1.9 for a more convenient alternative to inject. | Adam Keys | 2008-09-03 | 2 | -1/+26 | |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#962 state:committed] | |||||
* | Inline help text was incorrectly telling user to uncomment line to use ↵ | Nigel Ramsay | 2008-09-03 | 1 | -1/+1 | |
| | | | | | | | default local time. User should comment the line to use default local time. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#960 state:committed] | |||||
* | Whitespace. | Clemens Kofler | 2008-09-03 | 1 | -5/+5 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Some performance goodness for inheritable attributes. | Clemens Kofler | 2008-09-03 | 4 | -17/+17 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Some performance goodness for AR. | Clemens Kofler | 2008-09-03 | 1 | -1/+1 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Some performance goodness for AM Validations. | Clemens Kofler | 2008-09-03 | 1 | -2/+2 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Some performance goodness for AM StateMatchine. | Clemens Kofler | 2008-09-03 | 1 | -3/+3 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Some performance goodness for routing. | Clemens Kofler | 2008-09-03 | 1 | -3/+3 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Some performance goodness for AR associations. | Clemens Kofler | 2008-09-03 | 1 | -32/+32 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | More symbols for send and respond_to?. | Clemens Kofler | 2008-09-03 | 5 | -9/+9 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | More symbols for send and respond_to?. | Clemens Kofler | 2008-09-03 | 1 | -1/+1 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Use symbols for send and respond_to?. | Clemens Kofler | 2008-09-03 | 1 | -6/+6 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Removed unnecessary Symbol#to_proc from Asset Tag Helper. | Clemens Kofler | 2008-09-03 | 1 | -1/+1 | |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Don't set Content-Length on 304 responses | Jonathan del Strother | 2008-09-02 | 2 | -1/+7 | |
| | | | | | | | | | Commit 8aad8c claimed to do this, but it checks for the 304 status too early, before handle_conditional_get! has overridden it. [#958 state:resolved] Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> |