projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3177-collection-choose-files
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 1e882a9af76165c7c47af7eafb7160742f7cb429..53d42cb856e59903704b39e157bb118de6c4320f 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-56,13
+56,17
@@
GEM
bootstrap-x-editable-rails (1.5.1.1)
railties (>= 3.0)
builder (3.2.2)
bootstrap-x-editable-rails (1.5.1.1)
railties (>= 3.0)
builder (3.2.2)
+ byebug (3.5.1)
+ columnize (~> 0.8)
+ debugger-linecache (~> 1.2)
+ slop (~> 3.6)
capistrano (2.15.5)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
capistrano (2.15.5)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- capybara (2.
2.1
)
+ capybara (2.
4.4
)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@@
-78,8
+82,10
@@
GEM
coffee-script-source
execjs
coffee-script-source (1.7.0)
coffee-script-source
execjs
coffee-script-source (1.7.0)
+ columnize (0.8.9)
commonjs (0.2.7)
daemon_controller (1.1.7)
commonjs (0.2.7)
daemon_controller (1.1.7)
+ debugger-linecache (1.2.0)
deep_merge (1.0.1)
erubis (2.7.0)
execjs (2.0.2)
deep_merge (1.0.1)
erubis (2.7.0)
execjs (2.0.2)
@@
-121,7
+127,7
@@
GEM
treetop (~> 1.4.8)
metaclass (0.0.4)
mime-types (1.25.1)
treetop (~> 1.4.8)
metaclass (0.0.4)
mime-types (1.25.1)
- mini_portile (0.
5.2
)
+ mini_portile (0.
6.0
)
minitest (5.3.3)
mocha (1.1.0)
metaclass (~> 0.0.1)
minitest (5.3.3)
mocha (1.1.0)
metaclass (~> 0.0.1)
@@
-134,8
+140,8
@@
GEM
net-ssh (2.7.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
net-ssh (2.7.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- nokogiri (1.6.1)
- mini_portile (
~> 0.5
.0)
+ nokogiri (1.6.
3.
1)
+ mini_portile (
= 0.6
.0)
oj (2.1.7)
passenger (4.0.23)
daemon_controller (>= 1.1.0)
oj (2.1.7)
passenger (4.0.23)
daemon_controller (>= 1.1.0)
@@
-171,6
+177,7
@@
GEM
thor (>= 0.18.1, < 2.0)
rake (10.3.1)
ref (1.0.5)
thor (>= 0.18.1, < 2.0)
rake (10.3.1)
ref (1.0.5)
+ ruby-debug-passenger (0.2.0)
rubyzip (1.1.0)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
rubyzip (1.1.0)
rvm-capistrano (1.5.1)
capistrano (~> 2.15.4)
@@
-196,6
+203,7
@@
GEM
simplecov-html (0.7.1)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
simplecov-html (0.7.1)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
+ slop (3.6.0)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
@@
-238,6
+246,7
@@
DEPENDENCIES
bootstrap-sass (~> 3.1.0)
bootstrap-tab-history-rails
bootstrap-x-editable-rails
bootstrap-sass (~> 3.1.0)
bootstrap-tab-history-rails
bootstrap-x-editable-rails
+ byebug
capybara
coffee-rails
deep_merge
capybara
coffee-rails
deep_merge
@@
-254,6
+263,7
@@
DEPENDENCIES
piwik_analytics
poltergeist
rails (~> 4.1.0)
piwik_analytics
poltergeist
rails (~> 4.1.0)
+ ruby-debug-passenger
rvm-capistrano
sass
sass-rails
rvm-capistrano
sass
sass-rails