Switching to the mainline ruby-openid

docjason · Sep 20, 2012 · 9c5e0c4 · 9c5e0c4
1 parent b1e8ca7
commit 9c5e0c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.2.8'
 gem "health-data-standards", :git => "http://github.com/projectcypress/health-data-standards.git", :branch => "develop"
-gem 'ruby-openid', :git => 'http://github.com/rdingwell/ruby-openid.git' #,:branch => "master" 
+gem 'ruby-openid'
 gem "mongoid"
 gem "bson_ext"
 gem "pry"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -19,12 +19,6 @@ GIT
       rack-oauth2 (>= 0.11.0)
       rails (>= 3.1.0)
 
-GIT
-  remote: http://github.com/rdingwell/ruby-openid.git
-  revision: cc6fa401242190344935fb12a824fa39043cffc7
-  specs:
-    ruby-openid (2.1.9)
-
 GIT
   remote: https://github.com/project-rhex/omniauth_openid_connect.git
   revision: b12d89d5744b0fcf766b6e12e1fc6c2b2c4382df
@@ -234,6 +228,7 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    ruby-openid (2.2.0)
     rubyzip (0.9.9)
     sass (3.2.1)
     sass-rails (3.2.5)
@@ -312,7 +307,7 @@ DEPENDENCIES
   pry
   pry-nav
   rails (= 3.2.8)
-  ruby-openid!
+  ruby-openid
   sass-rails (~> 3.2.3)
   symbolize
   therubyracer