projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 4754-performance-benchmarks
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 70ef7a0f101abff207922b23bdbf97b22c86948c..d29c16ea4973020ffbb32d60ad6d7d54261116c2 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-10,27
+10,27
@@
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
- actionmailer (4.1.
1
)
- actionpack (= 4.1.
1
)
- actionview (= 4.1.
1
)
- mail (~> 2.5.4)
- actionpack (4.1.
1
)
- actionview (= 4.1.
1
)
- activesupport (= 4.1.
1
)
+ actionmailer (4.1.
8
)
+ actionpack (= 4.1.
8
)
+ actionview (= 4.1.
8
)
+ mail (~> 2.5
, >= 2.5
.4)
+ actionpack (4.1.
8
)
+ actionview (= 4.1.
8
)
+ activesupport (= 4.1.
8
)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- actionview (4.1.
1
)
- activesupport (= 4.1.
1
)
+ actionview (4.1.
8
)
+ activesupport (= 4.1.
8
)
builder (~> 3.1)
erubis (~> 2.7.0)
builder (~> 3.1)
erubis (~> 2.7.0)
- activemodel (4.1.
1
)
- activesupport (= 4.1.
1
)
+ activemodel (4.1.
8
)
+ activesupport (= 4.1.
8
)
builder (~> 3.1)
builder (~> 3.1)
- activerecord (4.1.
1
)
- activemodel (= 4.1.
1
)
- activesupport (= 4.1.
1
)
+ activerecord (4.1.
8
)
+ activemodel (= 4.1.
8
)
+ activesupport (= 4.1.
8
)
arel (~> 5.0.0)
arel (~> 5.0.0)
- activesupport (4.1.
1
)
+ activesupport (4.1.
8
)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@@
-38,18
+38,19
@@
GEM
tzinfo (~> 1.1)
addressable (2.3.6)
andand (1.3.3)
tzinfo (~> 1.1)
addressable (2.3.6)
andand (1.3.3)
+ angularjs-rails (1.3.3)
arel (5.0.1.20140414130214)
arel (5.0.1.20140414130214)
- arvados (0.1.2014
0917180103
)
+ arvados (0.1.2014
1114230720
)
activesupport (>= 3.2.13)
activesupport (>= 3.2.13)
- andand
- google-api-client (~> 0.6.3)
- json (>= 1.7.7)
+ 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)
autoparse (0.3.3)
addressable (>= 2.3.1)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
jwt (>= 0.1.5, < 1.0.0)
autoparse (0.3.3)
addressable (>= 2.3.1)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
- bootstrap-sass (3.1.
0
.1)
+ bootstrap-sass (3.1.
1
.1)
sass (~> 3.2)
bootstrap-tab-history-rails (0.1.0)
railties (>= 3.1)
sass (~> 3.2)
bootstrap-tab-history-rails (0.1.0)
railties (>= 3.1)
@@
-66,33
+67,33
@@
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.
2.1
)
+ capybara (2.
4.4
)
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.
1
)
+ childprocess (0.5.
5
)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
- coffee-rails (4.
0.1
)
+ coffee-rails (4.
1.0
)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
- coffee-script (2.
2
.0)
+ coffee-script (2.
3
.0)
coffee-script-source
execjs
coffee-script-source
execjs
- coffee-script-source (1.
7
.0)
+ coffee-script-source (1.
8
.0)
columnize (0.8.9)
commonjs (0.2.7)
columnize (0.8.9)
commonjs (0.2.7)
- daemon_controller (1.
1.7
)
+ daemon_controller (1.
2.0
)
debugger-linecache (1.2.0)
deep_merge (1.0.1)
erubis (2.7.0)
debugger-linecache (1.2.0)
deep_merge (1.0.1)
erubis (2.7.0)
- execjs (2.
0
.2)
+ execjs (2.
2
.2)
extlib (0.9.16)
faraday (0.8.9)
multipart-post (~> 1.2.0)
extlib (0.9.16)
faraday (0.8.9)
multipart-post (~> 1.2.0)
- ffi (1.9.
3
)
+ ffi (1.9.
6
)
google-api-client (0.6.4)
addressable (>= 2.3.2)
autoparse (>= 0.3.3)
google-api-client (0.6.4)
addressable (>= 2.3.2)
autoparse (>= 0.3.3)
@@
-103,95
+104,98
@@
GEM
multi_json (>= 1.0.0)
signet (~> 0.4.5)
uuidtools (>= 2.1.0)
multi_json (>= 1.0.0)
signet (~> 0.4.5)
uuidtools (>= 2.1.0)
- headless (1.0.
1
)
- highline (1.6.2
0
)
+ headless (1.0.
2
)
+ highline (1.6.2
1
)
hike (1.2.3)
hike (1.2.3)
- httpclient (2.5.
0
)
- i18n (0.6.
9
)
- jquery-rails (3.
0.4
)
+ httpclient (2.5.
3.3
)
+ i18n (0.6.
11
)
+ jquery-rails (3.
1.2
)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
jwt (0.1.13)
multi_json (>= 1.5)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
jwt (0.1.13)
multi_json (>= 1.5)
- launchy (2.4.
2
)
+ launchy (2.4.
3
)
addressable (~> 2.3)
addressable (~> 2.3)
- less (2.
4
.0)
+ less (2.
6
.0)
commonjs (~> 0.2.7)
commonjs (~> 0.2.7)
- less-rails (2.
4.2
)
+ less-rails (2.
6.0
)
actionpack (>= 3.1)
actionpack (>= 3.1)
- less (~> 2.4.0)
- libv8 (3.16.14.3)
- mail (2.5.4)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
+ less (~> 2.6.0)
+ libv8 (3.16.14.7)
+ mail (2.6.3)
+ mime-types (>= 1.16, < 3)
metaclass (0.0.4)
metaclass (0.0.4)
- mime-types (
1.25.1
)
- mini_portile (0.
5.2
)
- minitest (5.
3
.3)
+ mime-types (
2.4.3
)
+ mini_portile (0.
6.1
)
+ minitest (5.
4
.3)
mocha (1.1.0)
metaclass (~> 0.0.1)
mocha (1.1.0)
metaclass (~> 0.0.1)
- multi_json (1.10.0)
+ morrisjs-rails (0.5.1)
+ railties (> 3.1, < 5)
+ multi_json (1.10.1)
multipart-post (1.2.0)
multipart-post (1.2.0)
- net-scp (1.
1.2
)
+ net-scp (1.
2.1
)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (2.
7.0
)
+ net-ssh (2.
9.1
)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- nokogiri (1.6.1)
- mini_portile (~> 0.
5
.0)
- oj (2.1
.7
)
- passenger (4.0.
2
3)
- daemon_controller (>= 1.
1
.0)
+ nokogiri (1.6.
4.
1)
+ mini_portile (~> 0.
6
.0)
+ oj (2.1
1.1
)
+ passenger (4.0.
5
3)
+ daemon_controller (>= 1.
2
.0)
rack
rake (>= 0.8.1)
piwik_analytics (1.0.2)
actionpack
activesupport
rails (>= 3.0.0)
rack
rake (>= 0.8.1)
piwik_analytics (1.0.2)
actionpack
activesupport
rails (>= 3.0.0)
- poltergeist (1.5.
0
)
+ poltergeist (1.5.
1
)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
- polyglot (0.3.4)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
- rails (4.1.
1
)
- actionmailer (= 4.1.
1
)
- actionpack (= 4.1.
1
)
- actionview (= 4.1.
1
)
- activemodel (= 4.1.
1
)
- activerecord (= 4.1.
1
)
- activesupport (= 4.1.
1
)
+ rails (4.1.
8
)
+ actionmailer (= 4.1.
8
)
+ actionpack (= 4.1.
8
)
+ actionview (= 4.1.
8
)
+ activemodel (= 4.1.
8
)
+ activerecord (= 4.1.
8
)
+ activesupport (= 4.1.
8
)
bundler (>= 1.3.0, < 2.0)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.1.
1
)
+ railties (= 4.1.
8
)
sprockets-rails (~> 2.0)
sprockets-rails (~> 2.0)
- railties (4.1.1)
- actionpack (= 4.1.1)
- activesupport (= 4.1.1)
+ rails-perftest (0.0.5)
+ railties (4.1.8)
+ actionpack (= 4.1.8)
+ activesupport (= 4.1.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (10.3.1)
+ rake (10.4.0)
+ raphael-rails (2.1.2)
ref (1.0.5)
ruby-debug-passenger (0.2.0)
ref (1.0.5)
ruby-debug-passenger (0.2.0)
- rubyzip (1.1.0)
- rvm-capistrano (1.5.1)
+ ruby-prof (0.15.2)
+ rubyzip (1.1.6)
+ rvm-capistrano (1.5.5)
capistrano (~> 2.15.4)
capistrano (~> 2.15.4)
- sass (3.2.1
2
)
- sass-rails (4.0.
3
)
+ sass (3.2.1
9
)
+ sass-rails (4.0.
4
)
railties (>= 4.0.0, < 5.0)
railties (>= 4.0.0, < 5.0)
- sass (~> 3.2.
0
)
- sprockets (~> 2.8, <
= 2.11.0
)
+ sass (~> 3.2.
2
)
+ sprockets (~> 2.8, <
2.12
)
sprockets-rails (~> 2.0)
sprockets-rails (~> 2.0)
- selenium-webdriver (2.4
0
.0)
- childprocess (
>= 0.5.0
)
+ selenium-webdriver (2.4
4
.0)
+ childprocess (
~> 0.5
)
multi_json (~> 1.0)
rubyzip (~> 1.0)
multi_json (~> 1.0)
rubyzip (~> 1.0)
- websocket (~> 1.0
.4
)
+ websocket (~> 1.0)
signet (0.4.5)
addressable (>= 2.2.3)
faraday (~> 0.8.1)
signet (0.4.5)
addressable (>= 2.2.3)
faraday (~> 0.8.1)
@@
-204,34
+208,31
@@
GEM
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
slop (3.6.0)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
slop (3.6.0)
- sprockets (2.11.
0
)
+ sprockets (2.11.
3
)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.
1.3
)
+ sprockets-rails (2.
2.0
)
actionpack (>= 3.0)
activesupport (>= 3.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
- sprockets (
~> 2.8
)
- sqlite3 (1.3.
8
)
+ sprockets (
>= 2.8, < 4.0
)
+ sqlite3 (1.3.
10
)
sshkey (1.6.1)
sshkey (1.6.1)
- therubyracer (0.12.
0
)
+ therubyracer (0.12.
1
)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
- thread_safe (0.3.
3
)
+ thread_safe (0.3.
4
)
tilt (1.4.1)
tilt (1.4.1)
- treetop (1.4.15)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (1.1.0)
+ tzinfo (1.2.2)
thread_safe (~> 0.1)
thread_safe (~> 0.1)
- uglifier (2.
3.1
)
+ uglifier (2.
5.3
)
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.
0.7
)
- websocket-driver (0.
3.2
)
+ websocket (1.
2.1
)
+ websocket-driver (0.
4.0
)
wiselinks (1.2.1)
xpath (2.0.0)
nokogiri (~> 1.3)
wiselinks (1.2.1)
xpath (2.0.0)
nokogiri (~> 1.3)
@@
-242,7
+243,8
@@
PLATFORMS
DEPENDENCIES
RedCloth
andand
DEPENDENCIES
RedCloth
andand
- arvados (>= 0.1.20140917180103)
+ angularjs-rails
+ arvados (>= 0.1.20141114230720)
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
@@
-257,16
+259,20
@@
DEPENDENCIES
less-rails
minitest (>= 5.0.0)
mocha
less-rails
minitest (>= 5.0.0)
mocha
+ morrisjs-rails
multi_json
oj
passenger
piwik_analytics
poltergeist
rails (~> 4.1.0)
multi_json
oj
passenger
piwik_analytics
poltergeist
rails (~> 4.1.0)
+ rails-perftest
+ raphael-rails
ruby-debug-passenger
ruby-debug-passenger
+ ruby-prof
rvm-capistrano
sass
rvm-capistrano
sass
- sass-rails
+ sass-rails
(~> 4.0.4)
selenium-webdriver
simplecov (~> 0.7.1)
simplecov-rcov
selenium-webdriver
simplecov (~> 0.7.1)
simplecov-rcov