diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-04-03 22:22:03 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-04-03 22:22:03 +0200 |
| commit | 3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d (patch) | |
| tree | 31698977fbf077d079c70e5b258abc87042b5346 /actionpack/lib/action_controller/metal | |
| parent | a000fc58b8bc288ca9c60566afc1e1943f5d6083 (diff) | |
| parent | 4c323bc25a69ba8fd8b080775335184fe6868747 (diff) | |
| download | rails-3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d.tar.gz rails-3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d.tar.bz2 rails-3e24e9ebc22f96f9124d3a5d1c83b93c1bea937d.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/http_authentication.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb index b98429792d..1d6df89007 100644 --- a/actionpack/lib/action_controller/metal/http_authentication.rb +++ b/actionpack/lib/action_controller/metal/http_authentication.rb @@ -67,7 +67,7 @@ module ActionController # class PostsController < ApplicationController # REALM = "SuperSecret" # USERS = {"dhh" => "secret", #plain text password - # "dap" => Digest:MD5::hexdigest(["dap",REALM,"secret"].join(":")) #ha1 digest password + # "dap" => Digest::MD5.hexdigest(["dap",REALM,"secret"].join(":")) #ha1 digest password # # before_filter :authenticate, :except => [:index] # diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index 7a8fa7bd86..6469e24d36 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -222,6 +222,9 @@ module ActionController #:nodoc: # is quite simple (it just needs to respond to call), you can even give # a proc to it. # + # In order to use respond_with, first you need to declare the formats your + # controller responds to in the class level with a call to <tt>respond_to</tt>. + # def respond_with(*resources, &block) raise "In order to use respond_with, first you need to declare the formats your " << "controller responds to in the class level" if self.class.mimes_for_respond_to.empty? |