Merge branch 'master' into winning-strategy-authenticate-from-another…

…-scope
wardencommunity · Sep 17, 2017 · 9bb0e72 · 9bb0e72
2 parents 3e0349a + e131898
commit 9bb0e72
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,4 +4,4 @@ install:
 rvm:
   - 2.2
   - 2.3
-  - 2.4.1
+  - 2.4.2
diff --git a/History.rdoc b/History.rdoc
@@ -137,7 +137,7 @@
 
 === Version 0.5.1 / 2009-10-25
 * enhancements
-  * Adds yeilding to authenticated? and unauthenticated? methods (hassox)
+  * Adds yielding to authenticated? and unauthenticated? methods (hassox)
   * Adds an option to silence missing strategies (josevalim)
   * Add an option to authenticate(!) to prevent storage of a user into the session (hassox)
   * allow custom :action to be thrown (josevalim)

diff --git a/README.textile b/README.textile
@@ -1,4 +1,4 @@
-Please see the "Warden Wiki":http://wiki.github.com/hassox/warden for overview documentation.
+Please see the "Warden Wiki":https://wiki.github.com/hassox/warden for overview documentation.
 
 h2. Maintainers
 

diff --git a/warden.gemspec b/warden.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
      "README.textile"
   ]
   s.files = Dir["**/*"] - Dir["*.gem"] - ["Gemfile.lock"]
-  s.homepage = %q{http://github.com/hassox/warden}
+  s.homepage = %q{https://github.com/hassox/warden}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{warden}