projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3118-docker-fixes
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index a09f950636adbdbcc8a030235ff6234422451fac..3167a75ba77d4fae8bd29f96b78d50710f6201ed 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-35,12
+35,12
@@
GEM
addressable (2.3.6)
andand (1.3.3)
arel (3.0.3)
addressable (2.3.6)
andand (1.3.3)
arel (3.0.3)
- arvados (0.1.20140
414145041
)
+ arvados (0.1.20140
630151639
)
activesupport (>= 3.2.13)
andand
google-api-client (~> 0.6.3)
json (>= 1.7.7)
activesupport (>= 3.2.13)
andand
google-api-client (~> 0.6.3)
json (>= 1.7.7)
- arvados-cli (0.1.20140
414145041
)
+ arvados-cli (0.1.20140
630151639
)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1.0)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1.0)
@@
-99,7
+99,7
@@
GEM
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
- jwt (0.1.1
1
)
+ jwt (0.1.1
3
)
multi_json (>= 1.5)
launchy (2.4.2)
addressable (~> 2.3)
multi_json (>= 1.5)
launchy (2.4.2)
addressable (~> 2.3)
@@
-108,7
+108,7
@@
GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
- multi_json (1.
9.2
)
+ multi_json (1.
10.0
)
multipart-post (1.2.0)
net-scp (1.2.0)
net-ssh (>= 2.6.5)
multipart-post (1.2.0)
net-scp (1.2.0)
net-ssh (>= 2.6.5)
@@
-123,7
+123,7
@@
GEM
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
- oj (2.
7.3
)
+ oj (2.
9.0
)
omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth (1.1.1)
hashie (~> 1.2)
rack
@@
-139,6
+139,8
@@
GEM
pg
rails (~> 3.1)
polyglot (0.3.4)
pg
rails (~> 3.1)
polyglot (0.3.4)
+ puma (2.8.2)
+ rack (>= 1.1, < 2.0)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
@@
-164,7
+166,6
@@
GEM
rake (10.2.2)
rdoc (3.12.2)
json (~> 1.4)
rake (10.2.2)
rdoc (3.12.2)
json (~> 1.4)
- redis (3.0.7)
ref (1.0.5)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
ref (1.0.5)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
@@
-178,12
+179,17
@@
GEM
faraday (~> 0.8.1)
jwt (>= 0.1.5)
multi_json (>= 1.0.0)
faraday (~> 0.8.1)
jwt (>= 0.1.5)
multi_json (>= 1.0.0)
+ simplecov (0.7.1)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.7.1)
+ simplecov-html (0.7.1)
+ simplecov-rcov (0.2.3)
+ simplecov (>= 0.4.1)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.9)
test_after_commit (0.2.3)
themes_for_rails (0.5.1)
rails (>= 3.0.0)
test_after_commit (0.2.3)
themes_for_rails (0.5.1)
rails (>= 3.0.0)
@@
-209,7
+215,7
@@
PLATFORMS
DEPENDENCIES
acts_as_api
andand
DEPENDENCIES
acts_as_api
andand
- arvados-cli (>= 0.1.20140
328152103
)
+ arvados-cli (>= 0.1.20140
630151639
)
coffee-rails (~> 3.2.0)
database_cleaner
faye-websocket
coffee-rails (~> 3.2.0)
database_cleaner
faye-websocket
@@
-222,11
+228,12
@@
DEPENDENCIES
passenger
pg
pg_power
passenger
pg
pg_power
+ puma
rails (~> 3.2.0)
rails (~> 3.2.0)
- redis
rvm-capistrano
sass-rails (>= 3.2.0)
rvm-capistrano
sass-rails (>= 3.2.0)
- sqlite3
+ simplecov (~> 0.7.1)
+ simplecov-rcov
test_after_commit
themes_for_rails
therubyracer
test_after_commit
themes_for_rails
therubyracer