projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 7658-websockets-reconnect-on-close
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 58cd6c1a6e31159245856c6df00bd2486637e881..ac6be5a522303fd7418ba69974165e3b2821e17f 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-35,13
+35,13
@@
GEM
addressable (2.3.8)
andand (1.3.3)
arel (3.0.3)
addressable (2.3.8)
andand (1.3.3)
arel (3.0.3)
- arvados (0.1.201506
09141135
)
+ arvados (0.1.201506
15153458
)
activesupport (>= 3.2.13)
andand (~> 1.3, >= 1.3.3)
google-api-client (~> 0.6.3, >= 0.6.3)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
activesupport (>= 3.2.13)
andand (~> 1.3, >= 1.3.3)
google-api-client (~> 0.6.3, >= 0.6.3)
json (~> 1.7, >= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
- arvados-cli (0.1.2015
0205181653
)
+ arvados-cli (0.1.2015
1207150126
)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.20150128223554)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.20150128223554)
@@
-69,7
+69,7
@@
GEM
coffee-script-source
execjs
coffee-script-source (1.7.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
- curb (0.8.
6
)
+ curb (0.8.
8
)
daemon_controller (1.2.0)
database_cleaner (1.2.0)
erubis (2.7.0)
daemon_controller (1.2.0)
database_cleaner (1.2.0)
erubis (2.7.0)
@@
-227,8
+227,8
@@
PLATFORMS
DEPENDENCIES
acts_as_api
andand
DEPENDENCIES
acts_as_api
andand
- arvados (>= 0.1.20150
210011250
)
- arvados-cli (>= 0.1.2015
0128223752
)
+ arvados (>= 0.1.20150
615153458
)
+ arvados-cli (>= 0.1.2015
1207150126
)
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
@@
-256,3
+256,6
@@
DEPENDENCIES
therubyracer
trollop
uglifier (>= 1.0.3)
therubyracer
trollop
uglifier (>= 1.0.3)
+
+BUNDLED WITH
+ 1.10.6