projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 5310-arv-copy-by-pdh
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 1d91e08f1e2447d85d1d95653d20c7d8214d71ff..a6a8326eeb7be74ea0f54cfcf296b52c69d3e51d 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-32,16
+32,16
@@
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.
6
)
+ addressable (2.3.
7
)
andand (1.3.3)
arel (3.0.3)
andand (1.3.3)
arel (3.0.3)
- arvados (0.1.20150
128223752
)
+ arvados (0.1.20150
210011250
)
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.20150
128223752
)
+ arvados-cli (0.1.20150
205181653
)
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)
@@
-100,12
+100,12
@@
GEM
highline (1.6.21)
hike (1.2.3)
httpauth (0.2.1)
highline (1.6.21)
hike (1.2.3)
httpauth (0.2.1)
- i18n (0.
6.11
)
+ i18n (0.
7.0
)
journey (1.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
journey (1.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.8.
1
)
+ json (1.8.
2
)
jwt (0.1.13)
multi_json (>= 1.5)
launchy (2.4.3)
jwt (0.1.13)
multi_json (>= 1.5)
launchy (2.4.3)
@@
-130,7
+130,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.11.
1
)
+ oj (2.11.
4
)
omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth (1.1.1)
hashie (~> 1.2)
rack
@@
-210,7
+210,7
@@
GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- trollop (2.
0
)
+ trollop (2.
1.1
)
tzinfo (0.3.39)
uglifier (2.5.0)
execjs (>= 0.3.0)
tzinfo (0.3.39)
uglifier (2.5.0)
execjs (>= 0.3.0)
@@
-224,7
+224,7
@@
PLATFORMS
DEPENDENCIES
acts_as_api
andand
DEPENDENCIES
acts_as_api
andand
- arvados (>= 0.1.201
40919104705
)
+ arvados (>= 0.1.201
50210011250
)
arvados-cli (>= 0.1.20150128223752)
coffee-rails (~> 3.2.0)
database_cleaner
arvados-cli (>= 0.1.20150128223752)
coffee-rails (~> 3.2.0)
database_cleaner