projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6260: Remove extra hyphen from command line args.
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index a6a8326eeb7be74ea0f54cfcf296b52c69d3e51d..d671182a57c749b65bd9f7c93d2db215bc762f16 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-32,10
+32,10
@@
GEM
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
- addressable (2.3.
7
)
+ addressable (2.3.
8
)
andand (1.3.3)
arel (3.0.3)
andand (1.3.3)
arel (3.0.3)
- arvados (0.1.20150
210011250
)
+ arvados (0.1.20150
615153458
)
activesupport (>= 3.2.13)
andand (~> 1.3, >= 1.3.3)
google-api-client (~> 0.6.3, >= 0.6.3)
activesupport (>= 3.2.13)
andand (~> 1.3, >= 1.3.3)
google-api-client (~> 0.6.3, >= 0.6.3)
@@
-44,7
+44,7
@@
GEM
arvados-cli (0.1.20150205181653)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados-cli (0.1.20150205181653)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
- arvados (~> 0.1, >= 0.1.20150
128223554
)
+ arvados (~> 0.1, >= 0.1.20150
615153458
)
curb (~> 0.8)
google-api-client (~> 0.6.3, >= 0.6.3)
json (~> 1.7, >= 1.7.7)
curb (~> 0.8)
google-api-client (~> 0.6.3, >= 0.6.3)
json (~> 1.7, >= 1.7.7)
@@
-105,7
+105,7
@@
GEM
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.8.
2
)
+ json (1.8.
3
)
jwt (0.1.13)
multi_json (>= 1.5)
launchy (2.4.3)
jwt (0.1.13)
multi_json (>= 1.5)
launchy (2.4.3)
@@
-114,8
+114,11
@@
GEM
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
+ metaclass (0.0.4)
mime-types (1.25.1)
mime-types (1.25.1)
- multi_json (1.10.1)
+ mocha (1.1.0)
+ metaclass (~> 0.0.1)
+ multi_json (1.11.1)
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)
@@
-224,7
+227,7
@@
PLATFORMS
DEPENDENCIES
acts_as_api
andand
DEPENDENCIES
acts_as_api
andand
- arvados (>= 0.1.20150
210011250
)
+ arvados (>= 0.1.20150
615153458
)
arvados-cli (>= 0.1.20150128223752)
coffee-rails (~> 3.2.0)
database_cleaner
arvados-cli (>= 0.1.20150128223752)
coffee-rails (~> 3.2.0)
database_cleaner
@@
-232,6
+235,7
@@
DEPENDENCIES
faye-websocket
google-api-client (~> 0.6.3)
jquery-rails
faye-websocket
google-api-client (~> 0.6.3)
jquery-rails
+ mocha
multi_json
oj
omniauth (= 1.1.1)
multi_json
oj
omniauth (= 1.1.1)