aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into mailJeremy Kemper2009-11-2315-102/+118
|\
| * Pending test now passingJeremy Kemper2009-11-231-8/+6
| |
| * Fixed that the debugger wouldn't go into IRB mode because of left-over ARGVs ↵David Heinemeier Hansson2009-11-232-0/+4
| | | | | | | | [DHH]
| * Revert "Revert "Assert primary key does not exist in habtm when the ↵Jeremy Kemper2009-11-235-31/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | association is defined, instead of doing that everytime a record is inserted."" This reverts commit 2b82708b0efb3a3458e8177beab58f0c585788ae. [#3128 state:resolved] Conflicts: activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
| * Ensure generator fallbacks work even when a context is given.José Valim2009-11-232-1/+8
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
| * Also load generators at lib/rails_generators.José Valim2009-11-232-22/+10
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
| * Create SyncListener. Since they do not rely on Thread, they can be used on ↵José Valim2009-11-232-35/+74
| | | | | | | | | | | | Google App Engine. Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
| * Explicit source no longer needed, default gems source points to gemcutter.Jeremy Kemper2009-11-221-3/+0
| |
| * macruby: no format_datetime or msg2strJeremy Kemper2009-11-211-2/+2
| |
* | Merge commit 'mikel/master' into mailJeremy Kemper2009-11-237-30/+37
|\ \ | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb
| * | Change require mail version to 1.3.0Mikel Lindsaar2009-11-241-1/+1
| | |
| * | Changed deprecation to use ActiveSupport::DeprecationMikel Lindsaar2009-11-241-2/+3
| | |
| * | Fixed up incompatible encoding problem for Ruby 1.9 in test suiteMikel Lindsaar2009-11-232-3/+13
| | |
| * | Deprecating attachment :body => 'string' in favour of attachment :data => ↵Mikel Lindsaar2009-11-232-6/+10
| | | | | | | | | | | | 'string'
| * | Removing utils, and updating requires to matchMikel Lindsaar2009-11-234-20/+12
| | |
* | | Add mail dep to AM gemspecJeremy Kemper2009-11-232-3/+1
| | |
* | | Never require jcodeJeremy Kemper2009-11-221-1/+0
| | |
* | | Rely on gemspec and bundled env for gem dependency. We just require it.Jeremy Kemper2009-11-221-2/+1
| | |
* | | Bundle mail 1.2.8Jeremy Kemper2009-11-221-0/+3
| | |
* | | Merge commit 'origin/master' into mailJeremy Kemper2009-11-22211-2360/+1626
|\ \ \ | |/ / |/| / | |/
| * Fix Rails::Rack::Static deprecated constant proxyJeremy Kemper2009-11-211-1/+1
| |
| * Update gemspec alsoJeremy Kemper2009-11-192-2/+1
| |
| * Should be rackmount 0.2Joshua Peek2009-11-191-1/+1
| |
| * Depend on rack-mount 0.0.2Joshua Peek2009-11-191-1/+1
| |
| * Extended and case insensitive regexp routes aren't that important.Joshua Peek2009-11-191-15/+24
| | | | | | | | Mark them as pending till I figure it out.
| * Update routing for rackmount 0.2 api changesJoshua Peek2009-11-191-54/+11
| |
| * Revert "Final steps toward clean rails "foo"; cd foo; gem bundle; ↵Jeremy Kemper2009-11-198-13/+13
| | | | | | | | | | | | | | | | script/server working" Broke stuff. This reverts commit 520b8b59110dd130c89b317b6bd65d8644c7836f.
| * Add basic nested named route support to new routing dsl. Also add aJoshua Peek2009-11-192-8/+70
| | | | | | | | bunch of pending tests.
| * Fix test bleedJeremy Kemper2009-11-181-1/+1
| |
| * Final steps toward clean rails "foo"; cd foo; gem bundle; script/server workingYehuda Katz + Carl Lerche2009-11-188-13/+13
| |
| * Check whether another lib has implemented ruby 1.9 string interp syntaxJeremy Kemper2009-11-181-1/+1
| |
| * Extract form_authenticity_param instance method so it's overridable in ↵Jeremy Kemper2009-11-172-1/+24
| | | | | | | | subclasses
| * Insert generated association members in the same order they are specified ↵Gabe da Silveira2009-11-172-2/+25
| | | | | | | | | | | | | | | | when assigning to a has_many :through using the generated *_ids method [#3491 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Revert "Ensure Model#destroy respects optimistic locking"Jeremy Kemper2009-11-172-52/+0
| | | | | | | | | | | | | | | | | | | | [#1966 state:open] This reverts commit 0d922885fb54c19f04680482f024452859218910. Conflicts: activerecord/lib/active_record/locking/optimistic.rb
| * Merge remote branch 'Fingertips/master'Joshua Peek2009-11-162-13/+66
| |\
| | * Allow explicit placement of hidden id element for nested models.Will Read2009-11-152-13/+66
| | | | | | | | | | | | | | | | | | [#3259 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
| * | Make script/server work with correct application.rbYehuda Katz2009-11-162-1/+6
| | |
| * | Require action_dispatch, not action_controllerYehuda Katz2009-11-161-1/+1
| | |
| * | Temporarily add submodules to the Rails repo for Arel and Rack::Mount. These ↵Yehuda Katz2009-11-163-0/+12
| |/ | | | | | | submodules will be removed once we add proper Gemfile following to bundler
| * Ruby 1.9: skip pg locking test for 1.9.1 alsoJeremy Kemper2009-11-151-1/+1
| |
| * Add TimeZone dependencyYehuda Katz2009-11-141-0/+2
| |
| * Repair time dependenciesJeremy Kemper2009-11-148-13/+9
| |
| * Loosen optional gem deps from ~> to >=Jeremy Kemper2009-11-141-1/+1
| |
| * Remove Gemfile deps duplicated from AP gemspecJeremy Kemper2009-11-142-3/+1
| |
| * Just use abstract_unitJeremy Kemper2009-11-141-12/+1
| |
| * Fix bundler environment checkJeremy Kemper2009-11-141-1/+1
| |
| * No need for test stubJeremy Kemper2009-11-141-2/+2
| |
| * No need to check for generated method, just redispatchJeremy Kemper2009-11-141-4/+3
| |
| * Ruby 1.9.2: use recursive flattenJeremy Kemper2009-11-141-7/+1
| |
| * Skip pg locking test due to connection checkout deadlock detectionJeremy Kemper2009-11-141-5/+8
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 13:41:43 +0000