github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-22 12:57:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,661 Commits 34 Branches 105 Tags
c7057a213dbbd506defea5ededfd949bcce25858
Commit Graph

9661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Koziarski
c7057a213d Remove strange .diff file 2009-11-25 18:56:30 +13:00
Michael Koziarski
ec542caf58 Prepare for the 2.3.5 release 2009-11-25 18:56:12 +13:00
David Heinemeier Hansson
27b935dec6 Merge branch '2-3-stable' of github.com:rails/rails into 2-3-stable 2009-11-23 15:35:42 -06:00
David Heinemeier Hansson
d796fc638f Fixed that the debugger wouldn't go into IRB mode because of left-over ARGVs [DHH] 2009-11-23 15:35:25 -06:00
Joshua Peek
0f0f977625 Revert "Prefix Internet Explorer's accepted mime types with sensible defaults." 
IE XHR requests are misinterpreted as HTML instead of JS.

This reverts commit c680f2372e.
 2009-11-23 11:19:39 -06:00
Jeremy Kemper
0bc150c884 Rails 3: move core_ext/blank to core_ext/object/blank for forward compatibility 2009-11-22 14:50:12 -08:00
Michael Koziarski
93085a7d6c Handle a nil logger when generating Deprecation warnings 2009-11-19 14:22:36 +13:00
Jeremy Kemper
a942d66597 Extract form_authenticity_param instance method so it's overridable in subclasses 2009-11-17 23:36:48 -08:00
Gabe da Silveira
df0720b8b7 Insert generated association members in the same order they are specified when assigning to a has_many :through using the generated *_ids method 
[#3491 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-11-17 22:24:53 -08:00
Jeremy Kemper
ed320cd896 Revert "Ensure Model#destroy respects optimistic locking" 
Unresolved issues with :dependent => :destroy and counter caching.

[#1966 state:open]

This reverts commit 0d922885fb.
 2009-11-17 15:31:02 -08:00
Will Read
88d2e4ca6f Allow explicit placement of hidden id element for nested models. 
[#3259 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
 2009-11-15 21:50:35 +01:00
Jeremy Kemper
6da0365383 Loosen i18n gem deps from ~> to >= 2009-11-14 03:33:12 -08:00
Jeremy Kemper
78f5ecf02f CI: test AR + sqlite 2 on 1.8 only 2009-11-13 23:32:32 -08:00
Jeremy Kemper
6950f0cef2 Typo 2009-11-13 19:40:59 -08:00
Jeremy Kemper
4c3477ce77 Ruby 1.9: skip fcgi handler tests 2009-11-13 19:27:01 -08:00
Jeremy Kemper
4ffe2e171a CI: upgrade mysql, mocha, sqlite3-ruby 2009-11-13 18:44:07 -08:00
Jeremy Kemper
90f3272f1d Remove weird zombie test 2009-11-13 18:16:11 -08:00
Jeremy Kemper
c27cb5e1d4 Ruby 1.9: remove dep on T::U::AssertionFailedError 2009-11-13 18:05:14 -08:00
Jeremy Kemper
9abab5ba02 Test railties earlier rather than having to wait through AR 2009-11-13 13:15:03 -08:00
Jeremy Kemper
61bb491cbe Ruby 1.9.2: use super rather than raise our own NoMethodError to work around to_ary issues 2009-11-13 13:03:10 -08:00
Jeremy Kemper
3fa8ca5845 Ruby 1.9.2: StringIO no longer has #path 2009-11-13 13:02:29 -08:00
Jeremy Kemper
2d67ef9416 Ruby 1.9.2: prefer Array.wrap to [foo].flatten 2009-11-13 12:59:16 -08:00
Jeremy Kemper
f62a8831fe test-unit 2: filter_backtrace is private 2009-11-13 12:47:07 -08:00
Jeremy Kemper
3a3dfe4996 Ruby 1.9.2: fix broken to_ary expectation 2009-11-13 12:42:40 -08:00
Jeremy Kemper
de0384008c Ruby 1.9.2: disallow explicit coercion via method_missing. Only give friendly nil errors for Array and Active Record methods. 2009-11-13 12:28:37 -08:00
David Vrensk
4bc58a215f Rdoc for changes introduced in 6339e5d36, 542d6a0abd. 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-11-12 11:20:34 -08:00
José Valim
a4540128a4 [PATCH] Optimize Error I18n to avoid unecessary lookups and just retrieve values when needed [#3477 status:resolved]. 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-11-10 12:26:33 -06:00
Matt Jones
6c0028d5cc delete correct records for a has_many with :primary_key and :dependent => :delete_all 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2009-11-10 18:07:04 +13:00
Bryan Helmkamp
22e1f4b307 Silence warning: instance variable @selected not initialized 2009-11-09 17:24:18 -05:00
Bryan Helmkamp
b45d44cff0 Silence warning: ambiguous first argument; put parentheses or even spaces 2009-11-09 17:24:13 -05:00
Bryan Helmkamp
40f0ef7a37 Silence warning: instance variable @segment not initialized 2009-11-09 17:24:09 -05:00
Bryan Helmkamp
ea345a540f Silence warning: instance variable @integration_session not initialized 2009-11-09 17:24:03 -05:00
Bryan Helmkamp
ae5e2f5919 Silence warning: instance variable @auto_index not initialized 2009-11-09 17:23:59 -05:00
Bryan Helmkamp
8073e47262 Silence warning: instance variable @explicit_view_paths not initialized 2009-11-09 17:23:55 -05:00
Bryan Helmkamp
a0d28dcfd4 Silence warning: instance variable @real_format not initialized 2009-11-09 17:23:50 -05:00
Bryan Helmkamp
17fda24523 Silence warning: instance variable @controller not initialized 2009-11-09 17:23:37 -05:00
Bryan Helmkamp
a3ab2b0ee1 Silence warning: instance variable @session not initialized 2009-11-09 17:23:30 -05:00
Jeremy Kemper
bfb931b865 Bump CI rack to 1.0.1 2009-11-09 12:43:10 -08:00
Jeremy Kemper
97a7cdca17 Merge commit 'brynary/2-3-stable' into 2-3-stable 2009-11-09 12:26:21 -08:00
Bryan Helmkamp
b68861a00f Silence warning: method redefined; discarding old template 2009-11-09 15:15:09 -05:00
Bryan Helmkamp
2ccd4e790e Silence warning: method redefined; discarding old filename 2009-11-09 15:14:18 -05:00
Bryan Helmkamp
8820bb7eff Silence warning: discarding old h 2009-11-09 15:12:33 -05:00
Jeremy Kemper
fd0289f3dd Bump Rack to 1.0.1. Ensure integration test input is ASCII. 2009-11-09 11:21:12 -08:00
Jeremy Kemper
a3e129f79b Shush 2009-11-09 10:36:31 -08:00
Jeremy Kemper
d81c606fba Work around Float faux precision 2009-11-09 10:34:16 -08:00
Jeremy Kemper
9ea850027c Ruby 1.9 doesn't recognize EM SPACE as whitespace, breaking String#strip 2009-11-09 10:26:28 -08:00
Bryan Helmkamp
d988507dca Fix Ruby warning: method redefined; discarding old breakpoint 2009-11-09 12:57:04 -05:00
Bryan Helmkamp
6fdd60e65c Fix Ruby warning: instance variable @loaded not initialized 2009-11-09 12:57:04 -05:00
Bryan Helmkamp
1a93e93d1b Fix some Ruby warnings: `*' interpreted as argument prefix 2009-11-09 12:57:04 -05:00
Chris Hapgood
d36f8a2bf2 Share ActionView::TestCase's output_buffer with view for concat support. 
[#3467 state:resolved]

Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
 2009-11-07 00:15:11 +01:00