Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielgrippi <danielgrippi@gmail.com>2011-06-28 05:58:29 +0400
committerdanielgrippi <danielgrippi@gmail.com>2011-06-28 05:58:29 +0400
commit73fe74c834b4cd697cbf2a66bfc113c1c22821dd (patch)
treee52fc85ecee5099c70eb769a60d730fc7bdfd2e0 /Gemfile.lock
parent00ffade88473fd6bc09a4272f350db30b5a1c1cc (diff)
updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock19
1 files changed, 9 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a8ff7a3a0..8e0de7ceb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,8 +114,8 @@ GEM
ohai (>= 0.5.7)
rest-client (< 1.7.0, >= 1.0.4)
uuidtools
- childprocess (0.1.7)
- ffi (~> 0.6.3)
+ childprocess (0.1.9)
+ ffi (~> 1.0.6)
closure-compiler (1.1.1)
cloudfiles (1.4.10)
mime-types (>= 1.16)
@@ -160,8 +160,7 @@ GEM
faraday (~> 0.6.0)
fastercsv (1.5.4)
fastthread (1.0.7)
- ffi (0.6.3)
- rake (>= 0.8.7)
+ ffi (1.0.9)
fixture_builder (0.2.2)
fog (0.3.25)
builder
@@ -201,7 +200,7 @@ GEM
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
json (1.4.6)
- json_pure (1.5.1)
+ json_pure (1.5.3)
launchy (0.4.0)
configuration (>= 0.0.5)
rake (>= 0.8.1)
@@ -308,7 +307,7 @@ GEM
activesupport (= 3.0.3)
rake (>= 0.8.7)
thor (~> 0.14.4)
- rake (0.9.1)
+ rake (0.9.2)
rash (0.3.0)
hashie (~> 1.0.0)
rcov (0.9.9)
@@ -348,9 +347,9 @@ GEM
ruby-progressbar (0.0.10)
rubyntlm (0.1.1)
rubyzip (0.9.4)
- selenium-webdriver (0.1.3)
- childprocess (~> 0.1.5)
- ffi (~> 0.6.3)
+ selenium-webdriver (0.2.2)
+ childprocess (>= 0.1.9)
+ ffi (>= 1.0.7)
json_pure
rubyzip
settingslogic (2.0.6)
@@ -449,7 +448,7 @@ DEPENDENCIES
rspec-instafail (>= 0.1.7)
rspec-rails (>= 2.0.0)
ruby-debug
- selenium-webdriver (= 0.1.3)
+ selenium-webdriver (= 0.2.2)
settingslogic (= 2.0.6)
sod!
thin (= 1.2.11)