updating gemfile and gemfile.lock

This commit is contained in:
Maxwell Salzberg 2011-08-23 17:28:05 -07:00
parent 9740af3951
commit 89bd4f8da5
2 changed files with 18 additions and 22 deletions

View file

@ -25,7 +25,7 @@ gem 'omniauth', '0.2.6'
gem 'twitter', '1.5.0'
gem 'oauth2-provider', '0.0.16'
gem 'jwt', :git => "git://github.com/zhitomirskiyi/ruby-jwt.git", :require => false
gem 'jwt', "0.1.3"
#Web
gem 'faraday'
@ -119,7 +119,7 @@ group :test do
gem 'rspec-instafail', '>= 0.1.7', :require => false
gem 'fuubar'
gem 'diaspora-client', :path => '~/workspace/diaspora-client'
#:git => 'git://github.com/diaspora/diaspora-client.git'
gem 'diaspora-client', "0.1.0", #:path => '~/workspace/diaspora-client'
:git => 'git://github.com/diaspora/diaspora-client.git'
end

View file

@ -29,6 +29,17 @@ GIT
acts-as-taggable-on (2.0.6)
rails (>= 3.0)
GIT
remote: git://github.com/diaspora/diaspora-client.git
revision: dcc944e9bacd8fcc8a746c2bd21924a2a1213971
specs:
diaspora-client (0.1.0)
activerecord
faraday
jwt (>= 0.1.3)
oauth2 (= 0.4.1)
sinatra
GIT
remote: git://github.com/iain/http_accept_language.git
revision: 0b78aa7849fc90cf9e12586af162fa4c408a795d
@ -45,23 +56,6 @@ GIT
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
GIT
remote: git://github.com/zhitomirskiyi/ruby-jwt.git
revision: fa7f46b5ac3653e30cf60abc78de9ffb3319dc0c
specs:
jwt (0.1.3)
json (>= 1.2.4)
PATH
remote: ~/workspace/diaspora-client
specs:
diaspora-client (0.0.0)
activerecord
faraday
jwt (>= 0.1.3)
oauth2 (= 0.4.1)
sinatra
GEM
remote: http://rubygems.org/
specs:
@ -232,6 +226,8 @@ GEM
jasmine-core (1.1.0.rc3)
json (1.4.6)
json_pure (1.5.3)
jwt (0.1.3)
json (>= 1.2.4)
launchy (2.0.3)
linecache (0.43)
linecache19 (0.5.12)
@ -468,7 +464,7 @@ DEPENDENCIES
database_cleaner (= 0.6.0)
devise (~> 1.3.1)
devise_invitable (= 0.5.0)
diaspora-client!
diaspora-client (= 0.1.0)!
em-websocket!
excon (= 0.2.4)
factory_girl_rails
@ -486,7 +482,7 @@ DEPENDENCIES
jammit (= 0.5.4)
jasmine (= 1.1.0.rc3)
json (= 1.4.6)
jwt!
jwt (= 0.1.3)
launchy
linecache (= 0.43)
mini_magick (= 3.2)