projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3153-auto-setup-user
[arvados.git]
/
services
/
api
/
Gemfile.lock
diff --git
a/services/api/Gemfile.lock
b/services/api/Gemfile.lock
index 8fb6a52eed0f3109066fa86df2a5d157641cd46f..18fce168191a762672c379fe184153a60a5641b7 100644
(file)
--- a/
services/api/Gemfile.lock
+++ b/
services/api/Gemfile.lock
@@
-35,13
+35,13
@@
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
708213257
)
+ arvados (0.1.20140
812162850
)
activesupport (>= 3.2.13)
andand
google-api-client (~> 0.6.3)
json (>= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
activesupport (>= 3.2.13)
andand
google-api-client (~> 0.6.3)
json (>= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
- arvados-cli (0.1.20140
708213257
)
+ arvados-cli (0.1.20140
812162850
)
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)
@@
-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.
5
)
+ curb (0.8.
6
)
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)
@@
-95,7
+95,7
@@
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.
9
)
+ i18n (0.6.
11
)
journey (1.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
journey (1.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
@@
-110,7
+110,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.10.
0
)
+ multi_json (1.10.
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)
@@
-125,7
+125,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.
9
.0)
+ oj (2.
10
.0)
omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth (1.1.1)
hashie (~> 1.2)
rack
@@
-209,7
+209,7
@@
GEM
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
- uuidtools (2.1.
4
)
+ uuidtools (2.1.
5
)
websocket-driver (0.3.2)
PLATFORMS
websocket-driver (0.3.2)
PLATFORMS