Commit Graph

10767 Commits

Author SHA1 Message Date
Joshua Peek
ab8aac09d6 Need to reset session in internal integration tests after altering the route set 2009-09-06 22:01:58 -05:00
Joshua Peek
9f47f8d892 Fix isolated running of AddressesTest 2009-09-06 21:42:05 -05:00
Joshua Peek
1c02fc295d Fix isolated running of ActionPackAssertionTest 2009-09-06 21:19:29 -05:00
Joshua Peek
c3accd7ded Fix failing isolated routing test 2009-09-05 19:39:33 -05:00
Joshua Peek
59d1b23ea1 Fix failing ARes isolated tests 2009-09-05 19:24:43 -05:00
Joshua Peek
6dc9ad80e6 Fix warnings in AMo 2009-09-05 19:10:21 -05:00
Joshua Peek
c6e0923245 Fix failing AMo isolated tests 2009-09-05 18:54:19 -05:00
Joshua Peek
fe68cf2784 Fix failing AS isolated tests 2009-09-05 18:31:10 -05:00
Joshua Peek
ca2f2d1800 Turn warnings on for AS isolated tests 2009-09-05 18:24:58 -05:00
Michael Koziarski
87c93da440 Fix a messed up merge commit 2009-09-04 14:28:32 +12:00
Michael Koziarski
b16e0c9223 Clean tag attributes before passing through the escape_once logic.
Addresses CVE-2009-3009
2009-09-04 09:25:38 +12:00
Michael Koziarski
9a73630d93 Add verify and clean methods to ActiveSupport::Multibyte.
When accepting character input from outside of your application you can't
blindly trust that all strings are properly encoded. With these methods
you can check incoming strings and clean them up if necessary.

Signed-off-by: Michael Koziarski <michael@koziarski.com>

Conflicts:

	activesupport/lib/active_support/multibyte.rb
2009-09-04 09:25:38 +12:00
Coda Hale
5e6dab8b34 Fix timing attack vulnerability in ActiveSupport::MessageVerifier.
Use a constant-time comparison algorithm to compare the candidate HMAC with the calculated HMAC to prevent leaking information about the calculated HMAC.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
2009-09-04 09:25:38 +12:00
Jay Pignata
bd97c3044a CookieStore should not be derived from Hash - reverting [#2268 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-09-03 15:15:15 -05:00
Yehuda Katz + Carl Lerche
487ee41d2f Test for previous commit (we wrote it first, I swear) 2009-09-03 12:58:43 -07:00
Yehuda Katz + Carl Lerche
119793a4c1 Replace :formats => ["*/*"] with the default formats set 2009-09-03 12:52:53 -07:00
Yehuda Katz + Carl Lerche
e3744166ec Refactor ActionController to use find_template and template_exists? 2009-09-03 12:52:53 -07:00
Sam Pohlenz
4b6321efa9 Don't raise exceptions for missing javascript_include_tag or stylesheet_link_tag sources unless the :cache or :concat options are given. [#2738 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-09-03 14:01:01 -05:00
Yehuda Katz + Carl Lerche
f61dc0ef65 Remove a useless method in the fixture template class 2009-09-03 11:40:03 -07:00
Yehuda Katz + Carl Lerche
f3fc5c4b5f Refactor ActionView::Resolver 2009-09-03 11:18:57 -07:00
Yehuda Katz + Carl Lerche
dd34691b8d Extract finding the template in AC to it's own method 2009-09-03 11:18:56 -07:00
Jay Pignata
e0f1a7dc19 If session_options[:id] is requested when using CookieStore, unmarshal the session to access it [#2268 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-09-03 11:50:01 -05:00
Carl Lerche
f416f9f0ae Vendor the latest version of the bundler 2009-09-03 09:31:04 -07:00
Carl Lerche
e3f5fd536e Add ActiveModel's ./pkg and ./doc to .gitignore 2009-09-03 08:59:26 -07:00
Jeremy Kemper
3b6a9a020e Revert "Assert primary key does not exist in habtm when the association is defined, instead of doing that everytime a record is inserted."
Test failures on PostgreSQL.

[#3128 state:open]

This reverts commit da636809da.
2009-09-02 13:55:47 -07:00
Joshua Peek
723a47bfb3 Kill AMo observing wrap_with_notifications since ARes was only using it 2009-09-02 11:44:36 -05:00
Jeffrey Hardy
e870e24887 Don't try to log protected attribute removal if there's no logger defined [#3135 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-09-02 11:21:20 -05:00
Jeffrey Hardy
41b3c912b7 Remove ClassInheritableAttributes test case, already covered by ActiveSupport [#3114 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-09-02 11:21:20 -05:00
Yehuda Katz
847907d753 Make Sam Ruby's test suite happy 2009-09-01 19:37:49 -07:00
Yehuda Katz + Carl Lerche
66a4585f88 Fix the */* with Net::HTTP bug [#3100 state:resolved] 2009-09-01 15:54:29 -07:00
Carl Lerche
bd53ebde72 Add required dependencies on activemodel 2009-09-01 12:26:00 -07:00
Carl Lerche
016b1d3596 Merge branch 'master' of git@github.com:rails/rails 2009-09-01 12:19:09 -07:00
José Valim
da636809da Assert primary key does not exist in habtm when the association is defined, instead of doing that everytime a record is inserted.
[#3128 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2009-09-01 10:15:23 -07:00
Joshua Peek
c5f6e038da ActionPack test helpers need to activate rack gem 2009-09-01 10:27:19 -05:00
Joshua Peek
ad49895fe8 Railties test helpers need to activate rack gem 2009-09-01 10:05:17 -05:00
Geoff Buesing
cc1efe7e5a Rails::Info doesn't require version for unwanted frameworks
[#3124 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2009-09-01 02:29:22 -07:00
Bryan Helmkamp
a5588ffc08 Activate rack-test gem before it's required. This shouldn't be necessary, but should fix the build for now 2009-08-31 23:17:43 -07:00
Joshua Peek
a79790e1a5 rack-test 0.4.2 has rack 1.1.pre goodies, we'll use it instead 2009-08-31 23:08:20 -05:00
Joshua Peek
426e76ad85 Temp rack-test gem needs proper gem source 2009-08-31 21:53:24 -05:00
Joshua Peek
14870257c1 Initializer middleware helper needs to require actioncontroller 2009-08-31 21:09:39 -05:00
Yehuda Katz
67f5d611f5 Add rake gemspec and gemspecs to the repo 2009-08-31 17:20:44 -07:00
Joshua Peek
66d713fc8f License, version, and gemspec for ActiveModel. Ship it! 2009-08-31 19:09:16 -05:00
Joshua Peek
ffd2cf1670 To make CI happy, use my edge rack-test gem (just for now) 2009-08-31 15:46:29 -05:00
Joshua Peek
b4068c12eb Restore rack gem dependency 2009-08-31 15:40:08 -05:00
Joshua Peek
5e5e34377c Back off rack 1.1-pre and bundle in the new testing goodies 2009-08-31 15:39:19 -05:00
Joshua Peek
8974ab2e2e action_dispatch and action_view are just more autoloads, so its okay to require them 2009-08-31 14:49:59 -05:00
Joshua Peek
c63dac81c1 Switch over to rack-test gem 2009-08-31 14:27:10 -05:00
Joshua Peek
6f40139b53 SessionHash#update and SessionHash#delete are missing a call to load! [#3056 state:resolved] 2009-08-31 13:39:06 -05:00
Kane
cf9f361699 added proc and symbol support to validates_numericality_of [#3049 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-08-31 13:35:14 -05:00
Yehuda Katz
7e3abbfdc2 Merge commit 'jose/generators' 2009-08-31 11:07:37 -07:00