Permalink
Browse files

Upgrade omniauth and twitter to their latest

  • Loading branch information...
1 parent c9516c1 commit 55cbb3908a69759f97bd2028e85e93a96604cb70 @carols10cents carols10cents committed Aug 13, 2012
Showing with 18 additions and 74 deletions.
  1. +2 −2 Gemfile
  2. +16 −72 Gemfile.lock
View
@@ -19,13 +19,13 @@ gem 'jquery-rails', "~> 1.0.12"
gem 'airbrake', "~> 3.0.9"
gem 'bcrypt-ruby', "~> 3.0.0"
gem 'unicorn', "~> 4.0.1"
-gem 'omniauth', :git => 'git://github.com/intridea/omniauth.git'
+gem 'omniauth', "~> 1.1.0"
gem "mongo_mapper", "~> 0.11.2"
gem "mongo", "= 1.6.2"
gem "bson", "= 1.6.2"
gem "bson_ext", "= 1.6.2"
gem "i18n", "~> 0.6.0"
-gem "twitter", "~> 1.6.2"
+gem "twitter", "~> 3.5.0"
gem "pony", "~> 1.3"
gem "rdiscount", "~> 1.6.8"
gem "ostatus", "~> 0.0.11"
View
@@ -17,44 +17,6 @@ GIT
rails (>= 3.0.0)
GIT
- remote: git://github.com/intridea/omniauth.git
- revision: 5aaa1ae45c9e9401bfb7cd7767358159c2b135eb
- specs:
- oa-basic (0.3.0.rc1)
- oa-core (= 0.3.0.rc1)
- rest-client (~> 1.6.0)
- oa-core (0.3.0.rc1)
- oa-enterprise (0.3.0.rc1)
- addressable (~> 2.2.6)
- net-ldap (~> 0.2.2)
- nokogiri (~> 1.5.0)
- oa-core (= 0.3.0.rc1)
- pyu-ruby-sasl (~> 0.0.3.1)
- rubyntlm (~> 0.1.1)
- oa-more (0.3.0.rc1)
- multi_json (~> 1.0.0)
- oa-core (= 0.3.0.rc1)
- rest-client (~> 1.6.0)
- oa-oauth (0.3.0.rc1)
- faraday (~> 0.7.3)
- multi_json (~> 1.0.0)
- multi_xml (~> 0.2.2)
- oa-core (= 0.3.0.rc1)
- oauth (~> 0.4.0)
- oauth2 (~> 0.5.0)
- oa-openid (0.3.0.rc1)
- oa-core (= 0.3.0.rc1)
- rack-openid (~> 1.3.1)
- ruby-openid-apps-discovery (~> 1.2.0)
- omniauth (0.3.0.rc1)
- oa-basic (= 0.3.0.rc1)
- oa-core (= 0.3.0.rc1)
- oa-enterprise (= 0.3.0.rc1)
- oa-more (= 0.3.0.rc1)
- oa-oauth (= 0.3.0.rc1)
- oa-openid (= 0.3.0.rc1)
-
-GIT
remote: git://github.com/rtomayko/rocco.git
revision: 727c510d635ba3b6fcf18caf3b0f89e16ef7e8f3
specs:
@@ -93,7 +55,7 @@ GEM
activesupport (3.2.8)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.6)
+ addressable (2.2.8)
airbrake (3.0.9)
activesupport
builder
@@ -137,12 +99,8 @@ GEM
execjs (1.2.4)
multi_json (~> 1.0)
fabrication (1.2.0)
- faraday (0.7.4)
- addressable (~> 2.2.6)
- multipart-post (~> 1.1.0)
- rack (>= 1.1.0, < 2)
- faraday_middleware (0.7.0)
- faraday (~> 0.7.3)
+ faraday (0.8.2)
+ multipart-post (~> 1.1)
ffi (1.1.0)
fssm (0.2.9)
haml (3.1.7)
@@ -151,7 +109,7 @@ GEM
activesupport (~> 3.0)
haml (~> 3.0)
railties (~> 3.0)
- hashie (1.1.0)
+ hashie (1.2.0)
hike (1.2.1)
i18n (0.6.0)
journey (1.0.4)
@@ -180,17 +138,14 @@ GEM
activemodel (~> 3.0)
activesupport (~> 3.0)
plucky (~> 0.5.1)
- multi_json (1.0.4)
- multi_xml (0.2.2)
- multipart-post (1.1.3)
+ multi_json (1.3.6)
+ multipart-post (1.1.5)
mustache (0.99.4)
- net-ldap (0.2.2)
newrelic_rpm (3.3.1)
nokogiri (1.5.5)
- oauth (0.4.5)
- oauth2 (0.5.0)
- faraday (>= 0.6.1, < 0.8)
- multi_json (~> 1.0.0)
+ omniauth (1.1.0)
+ hashie (~> 1.2)
+ rack
opub (0.0.1)
ostatus (0.0.11)
ratom (~> 0.7.0)
@@ -203,15 +158,11 @@ GEM
pony (1.3)
mail (> 2.0)
pygmentize (0.0.3)
- pyu-ruby-sasl (0.0.3.3)
quiet_assets (1.0.0)
rails (~> 3.1)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
- rack-openid (1.3.1)
- rack (>= 1.1.0)
- ruby-openid (>= 2.1.8)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
@@ -247,10 +198,6 @@ GEM
mime-types (>= 1.16)
rsa (0.1.4)
ruby-hmac (0.4.0)
- ruby-openid (2.1.8)
- ruby-openid-apps-discovery (1.2.0)
- ruby-openid (>= 2.1.7)
- rubyntlm (0.1.1)
rubyzip (0.9.9)
sass (3.1.21)
sass-rails (3.2.5)
@@ -264,7 +211,7 @@ GEM
rubyzip
show_me_the_cookies (1.1.0)
capybara (~> 1.0)
- simple_oauth (0.1.5)
+ simple_oauth (0.1.9)
simplecov (0.4.2)
simplecov-html (~> 0.4.4)
simplecov-html (0.4.5)
@@ -277,13 +224,10 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- twitter (1.6.2)
- faraday (~> 0.7.4)
- faraday_middleware (~> 0.7.0)
- hashie (~> 1.1.0)
- multi_json (~> 1.0.0)
- multi_xml (~> 0.2.0)
- simple_oauth (~> 0.1.5)
+ twitter (3.5.0)
+ faraday (~> 0.8)
+ multi_json (~> 1.3)
+ simple_oauth (~> 0.1.6)
tzinfo (0.3.33)
uglifier (1.0.0)
execjs (>= 0.3.0)
@@ -330,7 +274,7 @@ DEPENDENCIES
mongo_mapper (~> 0.11.2)
newrelic_rpm (~> 3.3.1)
nokogiri (~> 1.5.0)
- omniauth!
+ omniauth (~> 1.1.0)
opub (~> 0.0.1)
ostatus (~> 0.0.11)
osub (~> 0.0.6)
@@ -346,7 +290,7 @@ DEPENDENCIES
sass-rails (~> 3.2.5)
show_me_the_cookies (~> 1.1.0)
simplecov (~> 0.4.0)
- twitter (~> 1.6.2)
+ twitter (~> 3.5.0)
tzinfo (~> 0.3.29)
uglifier (~> 1.0.0)
unicorn (~> 4.0.1)

0 comments on commit 55cbb39

Please sign in to comment.