projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '12167-go-request-id'
[arvados.git]
/
apps
/
workbench
/
Gemfile.lock
diff --git
a/apps/workbench/Gemfile.lock
b/apps/workbench/Gemfile.lock
index 8b2118ce087d220c32edf4acd35e7a934404a946..93a92ce11cb85f57d43237c49d4fec7f07f9842f 100644
(file)
--- a/
apps/workbench/Gemfile.lock
+++ b/
apps/workbench/Gemfile.lock
@@
-8,45
+8,47
@@
GIT
GEM
remote: https://rubygems.org/
specs:
GEM
remote: https://rubygems.org/
specs:
- RedCloth (4.
2.9
)
- actionmailer (4.1.1
2
)
- actionpack (= 4.1.1
2
)
- actionview (= 4.1.1
2
)
+ RedCloth (4.
3.2
)
+ actionmailer (4.1.1
6
)
+ actionpack (= 4.1.1
6
)
+ actionview (= 4.1.1
6
)
mail (~> 2.5, >= 2.5.4)
mail (~> 2.5, >= 2.5.4)
- actionpack (4.1.1
2
)
- actionview (= 4.1.1
2
)
- activesupport (= 4.1.1
2
)
+ actionpack (4.1.1
6
)
+ actionview (= 4.1.1
6
)
+ activesupport (= 4.1.1
6
)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- actionview (4.1.1
2
)
- activesupport (= 4.1.1
2
)
+ actionview (4.1.1
6
)
+ activesupport (= 4.1.1
6
)
builder (~> 3.1)
erubis (~> 2.7.0)
builder (~> 3.1)
erubis (~> 2.7.0)
- activemodel (4.1.1
2
)
- activesupport (= 4.1.1
2
)
+ activemodel (4.1.1
6
)
+ activesupport (= 4.1.1
6
)
builder (~> 3.1)
builder (~> 3.1)
- activerecord (4.1.1
2
)
- activemodel (= 4.1.1
2
)
- activesupport (= 4.1.1
2
)
+ activerecord (4.1.1
6
)
+ activemodel (= 4.1.1
6
)
+ activesupport (= 4.1.1
6
)
arel (~> 5.0.0)
arel (~> 5.0.0)
- activerecord-nulldb-adapter (0.3.
1
)
+ activerecord-nulldb-adapter (0.3.
8
)
activerecord (>= 2.0.0)
activerecord (>= 2.0.0)
- activesupport (4.1.1
2
)
+ activesupport (4.1.1
6
)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
- addressable (2.3.6)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
andand (1.3.3)
andand (1.3.3)
- angularjs-rails (1.3.
8
)
+ angularjs-rails (1.3.
15
)
arel (5.0.1.20140414130214)
arel (5.0.1.20140414130214)
- arvados (0.1.201
50511150219
)
- activesupport (>= 3
.2.13
)
+ arvados (0.1.201
80302192246
)
+ activesupport (>= 3)
andand (~> 1.3, >= 1.3.3)
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)
+ google-api-client (>= 0.7, < 0.8.9)
+ i18n (~> 0)
+ json (>= 1.7.7, < 3)
+ jwt (>= 0.1.5, < 2)
autoparse (0.3.3)
addressable (>= 2.3.1)
extlib (>= 0.9.15)
autoparse (0.3.3)
addressable (>= 2.3.1)
extlib (>= 0.9.15)
@@
-57,102
+59,122
@@
GEM
railties (>= 3.1)
bootstrap-x-editable-rails (1.5.1.1)
railties (>= 3.0)
railties (>= 3.1)
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)
+ builder (3.2.3)
+ byebug (10.0.0)
+ capistrano (2.15.9)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
highline
net-scp (>= 1.0.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.6
)
+ childprocess (0.
8.0
)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
- coffee-rails (4.
1.0
)
+ coffee-rails (4.
2.2
)
coffee-script (>= 2.2.0)
coffee-script (>= 2.2.0)
- railties (>= 4.0.0
, < 5.0
)
- coffee-script (2.
3.0
)
+ railties (>= 4.0.0)
+ coffee-script (2.
4.1
)
coffee-script-source
execjs
coffee-script-source
execjs
- coffee-script-source (1.8.0)
- columnize (0.9.0)
+ coffee-script-source (1.12.2)
commonjs (0.2.7)
commonjs (0.2.7)
- daemon_controller (1.2.0)
- debugger-linecache (1.2.0)
- deep_merge (1.0.1)
+ concurrent-ruby (1.0.5)
+ deep_merge (1.2.1)
docile (1.1.5)
erubis (2.7.0)
docile (1.1.5)
erubis (2.7.0)
- execjs (2.
2.2
)
+ execjs (2.
7.0
)
extlib (0.9.16)
extlib (0.9.16)
- faraday (0.8.9)
- multipart-post (~> 1.2.0)
- fast_stack (0.1.0)
- rake
- rake-compiler
- ffi (1.9.10)
- flamegraph (0.1.0)
- fast_stack
- google-api-client (0.6.4)
- addressable (>= 2.3.2)
- autoparse (>= 0.3.3)
- extlib (>= 0.9.15)
- faraday (~> 0.8.4)
- jwt (>= 0.1.5)
- launchy (>= 2.1.1)
- multi_json (>= 1.0.0)
- signet (~> 0.4.5)
- uuidtools (>= 2.1.0)
+ faraday (0.14.0)
+ multipart-post (>= 1.2, < 3)
+ ffi (1.9.23)
+ flamegraph (0.9.5)
+ google-api-client (0.8.7)
+ activesupport (>= 3.2, < 5.0)
+ addressable (~> 2.3)
+ autoparse (~> 0.3)
+ extlib (~> 0.9)
+ faraday (~> 0.9)
+ googleauth (~> 0.3)
+ launchy (~> 2.4)
+ multi_json (~> 1.10)
+ retriable (~> 1.4)
+ signet (~> 0.6)
+ googleauth (0.6.2)
+ faraday (~> 0.12)
+ jwt (>= 1.4, < 3.0)
+ logging (~> 2.0)
+ memoist (~> 0.12)
+ multi_json (~> 1.11)
+ os (~> 0.9)
+ signet (~> 0.7)
+ grease (0.3.1)
headless (1.0.2)
headless (1.0.2)
- highline (1.6.21)
- httpclient (2.6.0.1)
- i18n (0.7.0)
- jquery-rails (3.1.2)
+ highline (1.7.10)
+ httpclient (2.8.3)
+ i18n (0.9.5)
+ concurrent-ruby (~> 1.0)
+ jquery-rails (3.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.8.3)
- jwt (0.1.13)
- multi_json (>= 1.5)
+ json (1.8.6)
+ jwt (1.5.6)
launchy (2.4.3)
addressable (~> 2.3)
less (2.6.0)
commonjs (~> 0.2.7)
launchy (2.4.3)
addressable (~> 2.3)
less (2.6.0)
commonjs (~> 0.2.7)
- less-rails (2.6.0)
- actionpack (>= 3.1)
+ less-rails (3.0.0)
+ actionpack (>= 4.0)
+ grease
less (~> 2.6.0)
less (~> 2.6.0)
- libv8 (3.16.14.7)
- mail (2.6.3)
- mime-types (>= 1.16, < 3)
+ sprockets (> 2, < 4)
+ tilt
+ libv8 (3.16.14.19)
+ little-plugger (1.1.4)
+ logging (2.2.2)
+ little-plugger (~> 1.1)
+ multi_json (~> 1.10)
+ lograge (0.9.0)
+ actionpack (>= 4)
+ activesupport (>= 4)
+ railties (>= 4)
+ request_store (~> 1.0)
+ logstash-event (1.2.02)
+ mail (2.7.0)
+ mini_mime (>= 0.1.1)
+ memoist (0.16.0)
metaclass (0.0.4)
metaclass (0.0.4)
- mime-types (2.6.1)
- mini_portile (0.6.2)
- minitest (5.7.0)
- mocha (1.1.0)
+ mime-types (3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0521)
+ mini_mime (1.0.0)
+ mini_portile2 (2.3.0)
+ minitest (5.10.3)
+ mocha (1.3.0)
metaclass (~> 0.0.1)
metaclass (~> 0.0.1)
- morrisjs-rails (0.5.1)
- railties (> 3.1, <
5
)
- multi_json (1.1
1.2
)
- multipart-post (
1.2
.0)
+ morrisjs-rails (0.5.1
.2
)
+ railties (> 3.1, <
6
)
+ multi_json (1.1
3.1
)
+ multipart-post (
2.0
.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
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)
- mini_portile (~> 0.6.0)
- oj (2.11.2)
- passenger (4.0.57)
- daemon_controller (>= 1.2.0)
+ net-ssh (4.2.0)
+ net-ssh-gateway (2.0.0)
+ net-ssh (>= 4.0.0)
+ nokogiri (1.8.2)
+ mini_portile2 (~> 2.3.0)
+ npm-rails (0.2.1)
+ rails (>= 3.2)
+ oj (3.5.0)
+ os (0.9.6)
+ passenger (5.2.1)
rack
rake (>= 0.8.1)
piwik_analytics (1.0.2)
rack
rake (>= 0.8.1)
piwik_analytics (1.0.2)
@@
-164,87
+186,95
@@
GEM
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
+ public_suffix (3.0.2)
rack (1.5.5)
rack (1.5.5)
- rack-mini-profiler (0.
9.2
)
- rack (>= 1.
1.3
)
+ rack-mini-profiler (0.
10.7
)
+ rack (>= 1.
2.0
)
rack-test (0.6.3)
rack (>= 1.0)
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.1.1
2
)
- actionmailer (= 4.1.1
2
)
- actionpack (= 4.1.1
2
)
- actionview (= 4.1.1
2
)
- activemodel (= 4.1.1
2
)
- activerecord (= 4.1.1
2
)
- activesupport (= 4.1.1
2
)
+ rails (4.1.1
6
)
+ actionmailer (= 4.1.1
6
)
+ actionpack (= 4.1.1
6
)
+ actionview (= 4.1.1
6
)
+ activemodel (= 4.1.1
6
)
+ activerecord (= 4.1.1
6
)
+ activesupport (= 4.1.1
6
)
bundler (>= 1.3.0, < 2.0)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.1.1
2
)
+ railties (= 4.1.1
6
)
sprockets-rails (~> 2.0)
sprockets-rails (~> 2.0)
- rails-perftest (0.0.
5
)
- railties (4.1.1
2
)
- actionpack (= 4.1.1
2
)
- activesupport (= 4.1.1
2
)
+ rails-perftest (0.0.
7
)
+ railties (4.1.1
6
)
+ actionpack (= 4.1.1
6
)
+ activesupport (= 4.1.1
6
)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (10.4.2)
- rake-compiler (0.9.5)
- rake
+ rake (12.3.0)
raphael-rails (2.1.2)
raphael-rails (2.1.2)
- ref (1.0.5)
+ rb-fsevent (0.10.3)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
+ ref (2.0.0)
+ request_store (1.4.0)
+ rack (>= 1.4)
+ retriable (1.4.1)
ruby-debug-passenger (0.2.0)
ruby-debug-passenger (0.2.0)
- ruby-prof (0.1
5.2
)
- rubyzip (1.
1.7
)
- rvm-capistrano (1.5.
5
)
+ ruby-prof (0.1
7.0
)
+ rubyzip (1.
2.1
)
+ rvm-capistrano (1.5.
6
)
capistrano (~> 2.15.4)
capistrano (~> 2.15.4)
- sass (3.4.9)
- sass-rails (5.0.1)
- railties (>= 4.0.0, < 5.0)
+ safe_yaml (1.0.4)
+ sass (3.5.5)
+ sass-listen (~> 4.0.0)
+ sass-listen (4.0.0)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
+ sass-rails (5.0.7)
+ railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
- tilt (
~> 1.1
)
- selenium-webdriver (2.
48.1
)
+ tilt (
>= 1.1, < 3
)
+ selenium-webdriver (2.
53.4
)
childprocess (~> 0.5)
childprocess (~> 0.5)
- multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
- signet (0.
4.5
)
- addressable (
>= 2.
2.3)
- faraday (~> 0.
8.1
)
- jwt (>=
0.1.5
)
- multi_json (
>= 1.0.
0)
- simplecov (0.
9
.1)
+ signet (0.
8.1
)
+ addressable (
~>
2.3)
+ faraday (~> 0.
9
)
+ jwt (>=
1.5, < 3.0
)
+ multi_json (
~> 1.1
0)
+ simplecov (0.
15
.1)
docile (~> 1.1.0)
docile (~> 1.1.0)
-
multi_json (~> 1.0
)
- simplecov-html (~> 0.
8
.0)
- simplecov-html (0.
8.0
)
+
json (>= 1.8, < 3
)
+ simplecov-html (~> 0.
10
.0)
+ simplecov-html (0.
10.2
)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
- s
lop (3.6.0
)
-
sprockets (3.2
.0)
- rack (
~> 1.0
)
- sprockets-rails (2.3.
2
)
+ s
prockets (3.7.1
)
+
concurrent-ruby (~> 1
.0)
+ rack (
> 1, < 3
)
+ sprockets-rails (2.3.
3
)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
- sshkey (1.
6.1
)
- therubyracer (0.12.
1
)
- libv8 (~> 3.16.14.
0
)
+ sshkey (1.
9.0
)
+ therubyracer (0.12.
3
)
+ libv8 (~> 3.16.14.
15
)
ref
ref
- thor (0.
19.1
)
- thread_safe (0.3.
5
)
- tilt (
1.4.1
)
- tzinfo (1.2.
2
)
+ thor (0.
20.0
)
+ thread_safe (0.3.
6
)
+ tilt (
2.0.8
)
+ tzinfo (1.2.
5
)
thread_safe (~> 0.1)
thread_safe (~> 0.1)
- uglifier (2.7.
0
)
+ uglifier (2.7.
2
)
execjs (>= 0.3.0)
json (>= 1.8.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
- uuidtools (2.1.5)
- websocket (1.2.2)
- websocket-driver (0.5.1)
+ websocket (1.2.5)
+ websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.
1
)
+ websocket-extensions (0.1.
3
)
wiselinks (1.2.1)
wiselinks (1.2.1)
- xpath (2.
0
.0)
+ xpath (2.
1
.0)
nokogiri (~> 1.3)
PLATFORMS
nokogiri (~> 1.3)
PLATFORMS
@@
-254,46
+284,51
@@
DEPENDENCIES
RedCloth
activerecord-nulldb-adapter
andand
RedCloth
activerecord-nulldb-adapter
andand
- angularjs-rails
+ angularjs-rails
(~> 1.3.8)
arvados (>= 0.1.20150511150219)
bootstrap-sass (~> 3.1.0)
bootstrap-tab-history-rails
bootstrap-x-editable-rails
byebug
arvados (>= 0.1.20150511150219)
bootstrap-sass (~> 3.1.0)
bootstrap-tab-history-rails
bootstrap-x-editable-rails
byebug
- capybara
+ capybara
(~> 2.5.0)
coffee-rails
deep_merge
flamegraph
coffee-rails
deep_merge
flamegraph
- headless
+ headless
(~> 1.0.2)
httpclient (~> 2.5)
jquery-rails
less
less-rails
httpclient (~> 2.5)
jquery-rails
less
less-rails
- minitest (>= 5.0.0)
+ lograge
+ logstash-event
+ mime-types
+ minitest (~> 5.10.3)
mocha
morrisjs-rails
multi_json
mocha
morrisjs-rails
multi_json
+ npm-rails
oj
passenger
piwik_analytics
oj
passenger
piwik_analytics
- poltergeist
+ poltergeist
(~> 1.5.1)
rack-mini-profiler
rack-mini-profiler
- rails (
~> 4.1.0
)
+ rails (
< 4.2
)
rails-perftest
raphael-rails
ruby-debug-passenger
ruby-prof
rvm-capistrano
rails-perftest
raphael-rails
ruby-debug-passenger
ruby-prof
rvm-capistrano
+ safe_yaml
sass
sass-rails
sass
sass-rails
- selenium-webdriver
+ selenium-webdriver
(~> 2.53.1)
simplecov (~> 0.7)
simplecov-rcov
sshkey
themes_for_rails!
therubyracer
simplecov (~> 0.7)
simplecov-rcov
sshkey
themes_for_rails!
therubyracer
- uglifier (
>= 1.0.3
)
+ uglifier (
~> 2.0
)
wiselinks
BUNDLED WITH
wiselinks
BUNDLED WITH
- 1.1
0.6
+ 1.1
6.1