projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 7454-azure-custom-data
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 20b8d6164ccca273e11756928a21c1a17851f07a..303d5830de18774db271edb7891397000e1fddc8 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-68,13
+68,13
@@
GEM
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- capybara (2.
4.4
)
+ capybara (2.
5.0
)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
- childprocess (0.5.
5
)
+ childprocess (0.5.
6
)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
coffee-rails (4.1.0)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
coffee-rails (4.1.0)
@@
-98,7
+98,7
@@
GEM
fast_stack (0.1.0)
rake
rake-compiler
fast_stack (0.1.0)
rake
rake-compiler
- ffi (1.9.
6
)
+ ffi (1.9.
10
)
flamegraph (0.1.0)
fast_stack
google-api-client (0.6.4)
flamegraph (0.1.0)
fast_stack
google-api-client (0.6.4)
@@
-132,14
+132,14
@@
GEM
mail (2.6.3)
mime-types (>= 1.16, < 3)
metaclass (0.0.4)
mail (2.6.3)
mime-types (>= 1.16, < 3)
metaclass (0.0.4)
- mime-types (2.
6.1
)
+ mime-types (2.
99
)
mini_portile (0.6.2)
minitest (5.7.0)
mocha (1.1.0)
metaclass (~> 0.0.1)
morrisjs-rails (0.5.1)
railties (> 3.1, < 5)
mini_portile (0.6.2)
minitest (5.7.0)
mocha (1.1.0)
metaclass (~> 0.0.1)
morrisjs-rails (0.5.1)
railties (> 3.1, < 5)
- multi_json (1.11.
1
)
+ multi_json (1.11.
2
)
multipart-post (1.2.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
multipart-post (1.2.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
@@
-148,7
+148,7
@@
GEM
net-ssh (2.9.2)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- nokogiri (1.6.
5
)
+ nokogiri (1.6.
6.4
)
mini_portile (~> 0.6.0)
oj (2.11.2)
passenger (4.0.57)
mini_portile (~> 0.6.0)
oj (2.11.2)
passenger (4.0.57)
@@
-192,7
+192,7
@@
GEM
ref (1.0.5)
ruby-debug-passenger (0.2.0)
ruby-prof (0.15.2)
ref (1.0.5)
ruby-debug-passenger (0.2.0)
ruby-prof (0.15.2)
- rubyzip (1.1.
6
)
+ rubyzip (1.1.
7
)
rvm-capistrano (1.5.5)
capistrano (~> 2.15.4)
sass (3.4.9)
rvm-capistrano (1.5.5)
capistrano (~> 2.15.4)
sass (3.4.9)
@@
-202,7
+202,7
@@
GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
- selenium-webdriver (2.4
4.0
)
+ selenium-webdriver (2.4
8.1
)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
@@
-239,7
+239,7
@@
GEM
execjs (>= 0.3.0)
json (>= 1.8.0)
uuidtools (2.1.5)
execjs (>= 0.3.0)
json (>= 1.8.0)
uuidtools (2.1.5)
- websocket (1.2.
1
)
+ websocket (1.2.
2
)
websocket-driver (0.5.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.1)
websocket-driver (0.5.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.1)
@@
-294,3
+294,6
@@
DEPENDENCIES
therubyracer
uglifier (>= 1.0.3)
wiselinks
therubyracer
uglifier (>= 1.0.3)
wiselinks
+
+BUNDLED WITH
+ 1.10.6