diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-30 13:38:57 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-30 13:46:37 -0700 |
commit | 1d2257deebb97e5a27ef86acd29ecc6c4f5efa37 (patch) | |
tree | 79d895e0b4b86388997a9baebfec6805463211e3 /actionpack/CHANGELOG | |
parent | 1ff954aaea764c16e812dadea44a07a3f4119905 (diff) | |
parent | 8d236ccb8499beb5896754fd6b769c59afec52d2 (diff) | |
download | rails-1d2257deebb97e5a27ef86acd29ecc6c4f5efa37.tar.gz rails-1d2257deebb97e5a27ef86acd29ecc6c4f5efa37.tar.bz2 rails-1d2257deebb97e5a27ef86acd29ecc6c4f5efa37.zip |
Merge remote branch 'technoweenie/http_token_authentication'
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r-- | actionpack/CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index edd7d113a6..4db9c4b84d 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *Rails 3.0.0 [beta 4/release candidate] (unreleased)* +* OAuth 2: HTTP Token Authorization support to complement Basic and Digest Authorization. [Rick Olson] + * Fixed inconsistencies in form builder and view helpers #4432 [Neeraj Singh] * Both :xml and :json renderers now forwards the given options to the model, allowing you to invoke them as render :xml => @projects, :include => :tasks [José Valim, Yehuda Katz] |