projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.curoverse.com:arvados into 2638-add-cache-age-disk-usage...
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 0795f752db7ee4d40a94f47d6addd27382fb75b2..8e748326a1582871efbef261ed72d2288fe70a87 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-48,9
+48,6
@@
GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
- capybara-webkit (1.1.0)
- capybara (~> 2.0, >= 2.0.2)
- json
childprocess (0.5.1)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
childprocess (0.5.1)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
@@
-67,6
+64,7
@@
GEM
erubis (2.7.0)
execjs (2.0.2)
ffi (1.9.3)
erubis (2.7.0)
execjs (2.0.2)
ffi (1.9.3)
+ headless (1.0.1)
highline (1.6.20)
hike (1.2.3)
httpclient (2.3.4.1)
highline (1.6.20)
hike (1.2.3)
httpclient (2.3.4.1)
@@
-151,6
+149,12
@@
GEM
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0.4)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0.4)
+ simplecov (0.7.1)
+ multi_json (~> 1.0)
+ simplecov-html (~> 0.7.1)
+ simplecov-html (0.7.1)
+ simplecov-rcov (0.2.3)
+ simplecov (>= 0.4.1)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
@@
-185,9
+189,9
@@
DEPENDENCIES
bootstrap-sass (~> 3.1.0)
bootstrap-x-editable-rails
capybara
bootstrap-sass (~> 3.1.0)
bootstrap-x-editable-rails
capybara
- capybara-webkit
coffee-rails (~> 3.2.0)
deep_merge
coffee-rails (~> 3.2.0)
deep_merge
+ headless
httpclient
jquery-rails
less
httpclient
jquery-rails
less
@@
-202,6
+206,8
@@
DEPENDENCIES
sass
sass-rails (~> 3.2.0)
selenium-webdriver
sass
sass-rails (~> 3.2.0)
selenium-webdriver
+ simplecov (~> 0.7.1)
+ simplecov-rcov
sqlite3
themes_for_rails
therubyracer
sqlite3
themes_for_rails
therubyracer