From 844bf48851a1de892b2a119ea93fedfdf9c3faad Mon Sep 17 00:00:00 2001
From: Ilya Zhitomirskiy <ilya@laptop.(none)>
Date: Tue, 14 Jun 2011 18:35:36 -0700
Subject: [PATCH] changed back to the git repo for client
---
Gemfile | 3 ++-
Gemfile.lock | 5 +++--
spec/chubbies/Gemfile | 3 ++-
spec/chubbies/Gemfile.lock | 11 ++++++++---
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/Gemfile b/Gemfile
index 7ff8ef2d55..1dbd9d68a5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,5 +94,6 @@ 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', :git => 'git@github.com:diaspora/diaspora-client.git'
+ #:path => "~/workspace/diaspora-client"
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 3a87666d52..d8322e2dc1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,8 +37,9 @@ GIT
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
-PATH
- remote: ~/workspace/diaspora-client
+GIT
+ remote: git@github.com:diaspora/diaspora-client.git
+ revision: 17ff61247dc6f272604fb517d6eacf4a0683a721
specs:
diaspora-client (0.0.0)
activerecord
diff --git a/spec/chubbies/Gemfile b/spec/chubbies/Gemfile
index 4e64d69682..4a9a96a653 100644
--- a/spec/chubbies/Gemfile
+++ b/spec/chubbies/Gemfile
@@ -7,4 +7,5 @@ gem 'json'
gem 'shotgun'
gem 'sqlite3'
gem 'activerecord', '3.0.3'
-gem 'diaspora-client', :path => "~/workspace/diaspora-client" #:git => 'git@github.com:diaspora/diaspora-client.git'
+gem 'diaspora-client', #:path => "~/workspace/diaspora-client"
+ :git => 'git@github.com:diaspora/diaspora-client.git'
diff --git a/spec/chubbies/Gemfile.lock b/spec/chubbies/Gemfile.lock
index 301df52ac1..29d9a515f0 100644
--- a/spec/chubbies/Gemfile.lock
+++ b/spec/chubbies/Gemfile.lock
@@ -1,8 +1,10 @@
-PATH
- remote: ~/workspace/diaspora-client
+GIT
+ remote: git@github.com:diaspora/diaspora-client.git
+ revision: 17ff61247dc6f272604fb517d6eacf4a0683a721
specs:
diaspora-client (0.0.0)
activerecord
+ em-synchrony
faraday
oauth2
sinatra
@@ -20,9 +22,12 @@ GEM
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
activesupport (3.0.3)
- addressable (2.2.4)
+ addressable (2.2.6)
arel (2.0.10)
builder (2.1.2)
+ em-synchrony (0.2.0)
+ eventmachine (>= 0.12.9)
+ eventmachine (0.12.10)
faraday (0.6.1)
addressable (~> 2.2.4)
multipart-post (~> 1.1.0)
--
GitLab