[ARVADOS] created: 741450ac1477adc85eb4484acceebb3437b390b5
Git user
git at public.curoverse.com
Mon Jul 24 14:34:26 EDT 2017
at 741450ac1477adc85eb4484acceebb3437b390b5 (commit)
commit 741450ac1477adc85eb4484acceebb3437b390b5
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Jul 24 14:33:58 2017 -0400
Fix unclosed P tag.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>
diff --git a/apps/workbench/app/views/jobs/_rerun_job_with_options_popup.html.erb b/apps/workbench/app/views/jobs/_rerun_job_with_options_popup.html.erb
index bf31e3b..ba68106 100644
--- a/apps/workbench/app/views/jobs/_rerun_job_with_options_popup.html.erb
+++ b/apps/workbench/app/views/jobs/_rerun_job_with_options_popup.html.erb
@@ -22,10 +22,17 @@ SPDX-License-Identifier: AGPL-3.0 %>
</div>
<div class="modal-body">
- <p> If this job is part of a pipeline, that pipeline would not know about the new job you are running.
- If you want to update your pipeline results, please re-run the pipeline instead.
- <p> The inputs and parameters will be the same as the current job.
- Thus, the new job will not reflect any changes made to the pipeline that initiated this job. </p>
+ <p>
+ If this job is part of a pipeline, that pipeline would not
+ know about the new job you are running. If you want to
+ update your pipeline results, please re-run the pipeline
+ instead.
+ </p>
+ <p>
+ The inputs and parameters will be the same as the current
+ job. Thus, the new job will not reflect any changes made
+ to the pipeline that initiated this job.
+ </p>
<div style="padding-left: 1em">
<% if (@job.supplied_script_version.blank? or
(@job.supplied_script_version == @job.script_version)) %>
commit 5ad5450bdbf5b696129ec26a4c9d9968b091fcc9
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Jul 24 10:37:46 2017 -0400
Update workbench dependencies.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 8e9fcbf..25390da 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -4,7 +4,8 @@
source 'https://rubygems.org'
-gem 'rails', '~> 4.1'
+# Tableless implementation in ArvadosBase breaks in Rails 4.2
+gem 'rails', '~> 4.1.0'
gem 'arvados', '>= 0.1.20150511150219'
gem 'activerecord-nulldb-adapter'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 0abe868..c23e856 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -8,45 +8,46 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- RedCloth (4.2.9)
- actionmailer (4.1.12)
- actionpack (= 4.1.12)
- actionview (= 4.1.12)
+ RedCloth (4.3.2)
+ actionmailer (4.1.16)
+ actionpack (= 4.1.16)
+ actionview (= 4.1.16)
mail (~> 2.5, >= 2.5.4)
- actionpack (4.1.12)
- actionview (= 4.1.12)
- activesupport (= 4.1.12)
+ actionpack (4.1.16)
+ actionview (= 4.1.16)
+ activesupport (= 4.1.16)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- actionview (4.1.12)
- activesupport (= 4.1.12)
+ actionview (4.1.16)
+ activesupport (= 4.1.16)
builder (~> 3.1)
erubis (~> 2.7.0)
- activemodel (4.1.12)
- activesupport (= 4.1.12)
+ activemodel (4.1.16)
+ activesupport (= 4.1.16)
builder (~> 3.1)
- activerecord (4.1.12)
- activemodel (= 4.1.12)
- activesupport (= 4.1.12)
+ activerecord (4.1.16)
+ activemodel (= 4.1.16)
+ activesupport (= 4.1.16)
arel (~> 5.0.0)
- activerecord-nulldb-adapter (0.3.1)
+ activerecord-nulldb-adapter (0.3.7)
activerecord (>= 2.0.0)
- activesupport (4.1.12)
+ activesupport (4.1.16)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
- addressable (2.4.0)
+ addressable (2.5.1)
+ public_suffix (~> 2.0, >= 2.0.2)
andand (1.3.3)
- angularjs-rails (1.3.8)
+ angularjs-rails (1.6.2)
arel (5.0.1.20140414130214)
- arvados (0.1.20160420143004)
+ arvados (0.1.20170629115132)
activesupport (>= 3, < 4.2.6)
andand (~> 1.3, >= 1.3.3)
- google-api-client (>= 0.7, < 0.9)
+ google-api-client (>= 0.7, < 0.8.9)
i18n (~> 0)
- json (~> 1.7, >= 1.7.7)
+ json (>= 1.7.7, < 3)
jwt (>= 0.1.5, < 2)
autoparse (0.3.3)
addressable (>= 2.3.1)
@@ -58,52 +59,44 @@ GEM
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 (9.0.6)
+ 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)
- capybara (2.5.0)
+ capybara (2.14.4)
+ addressable
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.7.1)
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)
- 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 (1.8.0)
- columnize (0.9.0)
+ coffee-script-source (1.12.2)
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.1.1)
docile (1.1.5)
erubis (2.7.0)
execjs (2.7.0)
extlib (0.9.16)
- faraday (0.9.2)
+ faraday (0.12.2)
multipart-post (>= 1.2, < 3)
- fast_stack (0.1.0)
- rake
- rake-compiler
- ffi (1.9.10)
- flamegraph (0.1.0)
- fast_stack
- google-api-client (0.8.6)
- activesupport (>= 3.2)
+ ffi (1.9.18)
+ flamegraph (0.9.5)
+ google-api-client (0.8.7)
+ activesupport (>= 3.2, < 5.0)
addressable (~> 2.3)
autoparse (~> 0.3)
extlib (~> 0.9)
@@ -113,159 +106,164 @@ GEM
multi_json (~> 1.10)
retriable (~> 1.4)
signet (~> 0.6)
- googleauth (0.5.1)
- faraday (~> 0.9)
+ googleauth (0.5.3)
+ faraday (~> 0.12)
jwt (~> 1.4)
logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
- headless (1.0.2)
- highline (1.6.21)
- httpclient (2.8.2.4)
- i18n (0.7.0)
- jquery-rails (3.1.2)
+ headless (2.3.1)
+ highline (1.7.8)
+ httpclient (2.8.3)
+ i18n (0.8.6)
+ jquery-rails (3.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.8.3)
- jwt (1.5.4)
+ json (1.8.6)
+ jwt (1.5.6)
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 (2.8.0)
+ actionpack (>= 4.0)
less (~> 2.6.0)
- libv8 (3.16.14.7)
+ sprockets (> 2, < 4)
+ tilt
+ libv8 (3.16.14.19)
little-plugger (1.1.4)
- logging (2.1.0)
+ logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
- lograge (0.3.6)
- actionpack (>= 3)
- activesupport (>= 3)
- railties (>= 3)
+ lograge (0.5.1)
+ actionpack (>= 4, < 5.2)
+ activesupport (>= 4, < 5.2)
+ railties (>= 4, < 5.2)
logstash-event (1.2.02)
- mail (2.6.3)
- mime-types (>= 1.16, < 3)
- memoist (0.14.0)
+ mail (2.6.6)
+ mime-types (>= 1.16, < 4)
+ memoist (0.16.0)
metaclass (0.0.4)
- mime-types (2.99)
- mini_portile (0.6.2)
- minitest (5.8.4)
- mocha (1.1.0)
+ mime-types (3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0521)
+ mini_portile2 (2.2.0)
+ minitest (5.10.3)
+ mocha (1.2.1)
metaclass (~> 0.0.1)
- morrisjs-rails (0.5.1)
- railties (> 3.1, < 5)
+ morrisjs-rails (0.5.1.2)
+ railties (> 3.1, < 6)
multi_json (1.12.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-ssh (2.9.2)
- net-ssh-gateway (1.2.0)
- net-ssh (>= 2.6.5)
- nokogiri (1.6.6.4)
- mini_portile (~> 0.6.0)
- oj (2.11.2)
+ net-ssh (4.1.0)
+ net-ssh-gateway (2.0.0)
+ net-ssh (>= 4.0.0)
+ nokogiri (1.8.0)
+ mini_portile2 (~> 2.2.0)
+ oj (3.3.2)
os (0.9.6)
- passenger (4.0.57)
- daemon_controller (>= 1.2.0)
+ passenger (5.1.6)
rack
rake (>= 0.8.1)
piwik_analytics (1.0.2)
actionpack
activesupport
rails (>= 3.0.0)
- poltergeist (1.5.1)
+ poltergeist (1.15.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
- multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
+ public_suffix (2.0.5)
rack (1.5.5)
- rack-mini-profiler (0.9.2)
- rack (>= 1.1.3)
+ rack-mini-profiler (0.10.5)
+ rack (>= 1.2.0)
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.1.12)
- actionmailer (= 4.1.12)
- actionpack (= 4.1.12)
- actionview (= 4.1.12)
- activemodel (= 4.1.12)
- activerecord (= 4.1.12)
- activesupport (= 4.1.12)
+ rails (4.1.16)
+ actionmailer (= 4.1.16)
+ actionpack (= 4.1.16)
+ actionview (= 4.1.16)
+ activemodel (= 4.1.16)
+ activerecord (= 4.1.16)
+ activesupport (= 4.1.16)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.1.12)
+ railties (= 4.1.16)
sprockets-rails (~> 2.0)
- rails-perftest (0.0.5)
- railties (4.1.12)
- actionpack (= 4.1.12)
- activesupport (= 4.1.12)
+ rails-perftest (0.0.7)
+ railties (4.1.16)
+ actionpack (= 4.1.16)
+ activesupport (= 4.1.16)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (10.4.2)
- rake-compiler (0.9.5)
- rake
+ rake (12.0.0)
raphael-rails (2.1.2)
- ref (1.0.5)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
+ ref (2.0.0)
retriable (1.4.1)
ruby-debug-passenger (0.2.0)
- ruby-prof (0.15.2)
- rubyzip (1.1.7)
- rvm-capistrano (1.5.5)
+ ruby-prof (0.16.2)
+ rubyzip (1.2.1)
+ rvm-capistrano (1.5.6)
capistrano (~> 2.15.4)
safe_yaml (1.0.4)
- sass (3.4.9)
- sass-rails (5.0.1)
- railties (>= 4.0.0, < 5.0)
+ sass (3.5.1)
+ 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.6)
+ railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
- tilt (~> 1.1)
- selenium-webdriver (2.53.1)
+ tilt (>= 1.1, < 3)
+ selenium-webdriver (3.4.4)
childprocess (~> 0.5)
- multi_json (~> 1.0)
rubyzip (~> 1.0)
- websocket (~> 1.0)
- signet (0.7.2)
+ signet (0.7.3)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (~> 1.5)
multi_json (~> 1.10)
- simplecov (0.9.1)
+ simplecov (0.14.1)
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.1)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
- slop (3.6.0)
- sprockets (3.2.0)
- rack (~> 1.0)
- sprockets-rails (2.3.2)
+ sprockets (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)
- 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
- thor (0.19.1)
- thread_safe (0.3.5)
- tilt (1.4.1)
- tzinfo (1.2.2)
+ thor (0.19.4)
+ thread_safe (0.3.6)
+ tilt (2.0.8)
+ tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
- websocket (1.2.2)
- websocket-driver (0.5.1)
+ websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.1)
+ websocket-extensions (0.1.2)
wiselinks (1.2.1)
- xpath (2.0.0)
+ xpath (2.1.0)
nokogiri (~> 1.3)
PLATFORMS
@@ -301,7 +299,7 @@ DEPENDENCIES
piwik_analytics
poltergeist
rack-mini-profiler
- rails (~> 4.1)
+ rails (~> 4.1.0)
rails-perftest
raphael-rails
ruby-debug-passenger
@@ -320,4 +318,4 @@ DEPENDENCIES
wiselinks
BUNDLED WITH
- 1.13.2
+ 1.15.1
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 8b9bf15..82286cc 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -66,7 +66,7 @@ production:
eager_load: true
consider_all_requests_local: false
action_controller.perform_caching: true
- serve_static_assets: false
+ serve_static_files: false
assets.compile: false
assets.digest: true
i18n.fallbacks: true
@@ -88,7 +88,7 @@ production:
test:
cache_classes: true
eager_load: false
- serve_static_assets: true
+ serve_static_files: true
static_cache_control: public, max-age=3600
consider_all_requests_local: true
action_controller.perform_caching: false
@@ -209,7 +209,7 @@ common:
# would be enabled in a collection's show page.
# It is sufficient to list only applications here.
# No need to list text and image types.
- application_mimetypes_with_view_icon: [cwl, fasta, go, javascript, json, pdf, python, r, rtf, sam, sh, vnd.realvnc.bed, xml, xsl]
+ application_mimetypes_with_view_icon: [cwl, fasta, go, javascript, json, pdf, x-python, r, rtf, sam, x-sh, vnd.realvnc.bed, xml, xsl]
# the maximum number of bytes to load in the log viewer
log_viewer_max_bytes: 1000000
diff --git a/apps/workbench/config/environments/production.rb.example b/apps/workbench/config/environments/production.rb.example
index cc88886..8b656c5 100644
--- a/apps/workbench/config/environments/production.rb.example
+++ b/apps/workbench/config/environments/production.rb.example
@@ -13,7 +13,7 @@ ArvadosWorkbench::Application.configure do
config.action_controller.perform_caching = true
# Disable Rails's static asset server (Apache or nginx will already do this)
- config.serve_static_assets = false
+ config.serve_static_files = false
# Compress JavaScripts and CSS
config.assets.js_compressor = :uglifier
diff --git a/apps/workbench/config/environments/test.rb.example b/apps/workbench/config/environments/test.rb.example
index 1c79020..0ea8af6 100644
--- a/apps/workbench/config/environments/test.rb.example
+++ b/apps/workbench/config/environments/test.rb.example
@@ -12,7 +12,7 @@ ArvadosWorkbench::Application.configure do
config.cache_classes = true
# Configure static asset server for tests with Cache-Control for performance
- config.serve_static_assets = true
+ config.serve_static_files = true
config.static_cache_control = "public, max-age=3600"
# Show full error reports and disable caching
commit e2807c625a765d4d2628c755216835909f5a7e12
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Jul 24 10:33:01 2017 -0400
Update api server dependencies.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index c59e59d..2c272f0 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -47,24 +47,24 @@ GEM
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
- addressable (2.5.0)
+ addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
andand (1.3.3)
arel (6.0.4)
- arvados (0.1.20170215224121)
+ arvados (0.1.20170629115132)
activesupport (>= 3, < 4.2.6)
andand (~> 1.3, >= 1.3.3)
google-api-client (>= 0.7, < 0.8.9)
i18n (~> 0)
- json (~> 1.7, >= 1.7.7)
+ json (>= 1.7.7, < 3)
jwt (>= 0.1.5, < 2)
- arvados-cli (0.1.20170322173355)
+ arvados-cli (0.1.20170711213448)
activesupport (>= 3.2.13, < 5)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1, >= 0.1.20150128223554)
curb (~> 0.8)
google-api-client (~> 0.6, >= 0.6.3, < 0.8.9)
- json (~> 1.7, >= 1.7.7)
+ json (>= 1.7.7, < 3)
oj (~> 2.0, >= 2.0.3)
trollop (~> 2.0)
autoparse (0.3.3)
@@ -78,15 +78,15 @@ GEM
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- coffee-rails (4.2.1)
+ coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
- railties (>= 4.0.0, < 5.2.x)
+ railties (>= 4.0.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
curb (0.9.3)
- database_cleaner (1.5.3)
+ database_cleaner (1.6.1)
erubis (2.7.0)
eventmachine (1.2.3)
execjs (2.7.0)
@@ -96,13 +96,13 @@ GEM
factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0)
railties (>= 3.0.0)
- faraday (0.11.0)
+ faraday (0.12.2)
multipart-post (>= 1.2, < 3)
faye-websocket (0.10.7)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
- globalid (0.3.7)
- activesupport (>= 4.1.0)
+ globalid (0.4.0)
+ activesupport (>= 4.2.0)
google-api-client (0.8.7)
activesupport (>= 3.2, < 5.0)
addressable (~> 2.3)
@@ -114,19 +114,19 @@ GEM
multi_json (~> 1.10)
retriable (~> 1.4)
signet (~> 0.6)
- googleauth (0.5.1)
- faraday (~> 0.9)
+ googleauth (0.5.3)
+ faraday (~> 0.12)
jwt (~> 1.4)
logging (~> 2.0)
memoist (~> 0.12)
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
- hashie (3.5.5)
+ hashie (3.5.6)
highline (1.7.8)
hike (1.2.3)
- i18n (0.8.1)
- jquery-rails (4.2.2)
+ i18n (0.8.6)
+ jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@@ -136,25 +136,25 @@ GEM
addressable (~> 2.3)
libv8 (3.16.14.19)
little-plugger (1.1.4)
- logging (2.2.0)
+ logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
- lograge (0.4.1)
- actionpack (>= 4, < 5.1)
- activesupport (>= 4, < 5.1)
- railties (>= 4, < 5.1)
+ lograge (0.5.1)
+ actionpack (>= 4, < 5.2)
+ activesupport (>= 4, < 5.2)
+ railties (>= 4, < 5.2)
logstash-event (1.2.02)
loofah (2.0.3)
nokogiri (>= 1.5.9)
- mail (2.6.4)
+ mail (2.6.6)
mime-types (>= 1.16, < 4)
- memoist (0.15.0)
+ memoist (0.16.0)
metaclass (0.0.4)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
- mini_portile2 (2.1.0)
- minitest (5.10.1)
+ mini_portile2 (2.2.0)
+ minitest (5.10.3)
mocha (1.2.1)
metaclass (~> 0.0.1)
multi_json (1.12.1)
@@ -167,10 +167,10 @@ GEM
net-ssh (4.1.0)
net-ssh-gateway (2.0.0)
net-ssh (>= 4.0.0)
- nokogiri (1.7.1)
- mini_portile2 (~> 2.1.0)
- oauth2 (1.3.1)
- faraday (>= 0.8, < 0.12)
+ nokogiri (1.8.0)
+ mini_portile2 (~> 2.2.0)
+ oauth2 (1.4.0)
+ faraday (>= 0.8, < 0.13)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
@@ -184,16 +184,16 @@ GEM
oauth2 (~> 1.0)
omniauth (~> 1.2)
os (0.9.6)
- passenger (5.1.2)
+ passenger (5.1.6)
rack
rake (>= 0.8.1)
- pg (0.20.0)
- power_assert (1.0.1)
- protected_attributes (1.1.3)
+ pg (0.21.0)
+ power_assert (1.0.2)
+ protected_attributes (1.1.4)
activemodel (>= 4.0.1, < 5.0)
public_suffix (2.0.5)
puma (2.16.0)
- rack (1.6.5)
+ rack (1.6.8)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.5.2)
@@ -215,8 +215,8 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
- rails-observers (0.1.2)
- activemodel (~> 4.0)
+ rails-observers (0.1.5)
+ activemodel (>= 4.0)
railties (4.2.5.2)
actionpack (= 4.2.5.2)
activesupport (= 4.2.5.2)
@@ -224,8 +224,9 @@ GEM
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
ref (2.0.0)
- responders (2.3.0)
- railties (>= 4.2.0, < 5.1)
+ responders (2.4.0)
+ actionpack (>= 4.2.0, < 5.3)
+ railties (>= 4.2.0, < 5.3)
retriable (1.4.1)
ruby-prof (0.16.2)
rvm-capistrano (1.5.6)
@@ -258,7 +259,7 @@ GEM
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sshkey (1.9.0)
- test-unit (3.2.3)
+ test-unit (3.2.5)
power_assert
test_after_commit (1.1.0)
activerecord (>= 3.2)
@@ -269,7 +270,7 @@ GEM
thread_safe (0.3.6)
tilt (1.4.1)
trollop (2.1.2)
- tzinfo (1.2.2)
+ tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
@@ -321,4 +322,4 @@ DEPENDENCIES
uglifier (~> 2.0)
BUNDLED WITH
- 1.14.3
+ 1.15.1
commit 2354f19adbcd14ad400e1655bbc0708957ada628
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Jul 21 16:11:47 2017 -0400
Add missing dependencies to vendor.json.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>
diff --git a/vendor/vendor.json b/vendor/vendor.json
index b847767..dca8b54 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -183,6 +183,18 @@
"revisionTime": "2014-06-24T18:46:26Z"
},
{
+ "checksumSHA1": "d9PxF1XQGLMJZRct2R8qVM/eYlE=",
+ "path": "github.com/hashicorp/golang-lru",
+ "revision": "0a025b7e63adc15a622f29b0b2c4c3848243bbf6",
+ "revisionTime": "2016-08-13T22:13:03Z"
+ },
+ {
+ "checksumSHA1": "9hffs0bAIU6CquiRhKQdzjHnKt0=",
+ "path": "github.com/hashicorp/golang-lru/simplelru",
+ "revision": "0a025b7e63adc15a622f29b0b2c4c3848243bbf6",
+ "revisionTime": "2016-08-13T22:13:03Z"
+ },
+ {
"checksumSHA1": "uTUsjF7bymOuKvXbW2BpkK/w4Vg=",
"path": "github.com/lib/pq",
"revision": "2704adc878c21e1329f46f6e56a1c387d788ff94",
commit 2aaf62d775b0ea4267fb64b6e8ca408558a654b2
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Jul 21 16:06:13 2017 -0400
Update Go dependencies.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 938f6a4..b847767 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -21,13 +21,6 @@
"revisionTime": "2017-02-25T09:28:51Z"
},
{
- "checksumSHA1": "Rjy2uYZkQ8Kjht6ZFU0qzm2I/kI=",
- "origin": "github.com/docker/docker/vendor/github.com/Microsoft/go-winio",
- "path": "github.com/Microsoft/go-winio",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
"checksumSHA1": "DYv6Q1+VfnUVxMwvk5IshAClLvw=",
"path": "github.com/Sirupsen/logrus",
"revision": "5e5dc898656f695e2a086b8e12559febbfc01562",
@@ -46,55 +39,6 @@
"revisionTime": "2016-12-14T20:08:43Z"
},
{
- "checksumSHA1": "qjY3SPlNvqT179DPiRaIsRhYZQI=",
- "origin": "github.com/docker/docker/vendor/github.com/docker/distribution",
- "path": "github.com/docker/distribution",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
- "checksumSHA1": "0au+tD+jymXNssdb1JgcctY7PN4=",
- "origin": "github.com/docker/docker/vendor/github.com/docker/distribution/context",
- "path": "github.com/docker/distribution/context",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
- "checksumSHA1": "Gj+xR1VgFKKmFXYOJMnAczC3Znk=",
- "origin": "github.com/docker/docker/vendor/github.com/docker/distribution/digestset",
- "path": "github.com/docker/distribution/digestset",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
- "checksumSHA1": "oYy5Q1HBImMQvh9t96cmNzWar80=",
- "origin": "github.com/docker/docker/vendor/github.com/docker/distribution/manifest",
- "path": "github.com/docker/distribution/manifest",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
- "checksumSHA1": "SK1g7ll2cPbgDyWpK0oVT9beVZY=",
- "origin": "github.com/docker/docker/vendor/github.com/docker/distribution/manifest/manifestlist",
- "path": "github.com/docker/distribution/manifest/manifestlist",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
- "checksumSHA1": "m4wEFD0Mh+ClfprUqgl0GyNmk7Q=",
- "origin": "github.com/docker/docker/vendor/github.com/docker/distribution/reference",
- "path": "github.com/docker/distribution/reference",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
- "checksumSHA1": "cNp7rNReJHvdSfrIetXS9RGsLSo=",
- "origin": "github.com/docker/docker/vendor/github.com/docker/distribution/uuid",
- "path": "github.com/docker/distribution/uuid",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
"checksumSHA1": "5b7eC73lORtIUFCjz548jXkLlKU=",
"path": "github.com/docker/docker/api",
"revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
@@ -221,41 +165,6 @@
"revisionTime": "2017-05-17T20:48:28Z"
},
{
- "checksumSHA1": "JbiWTzH699Sqz25XmDlsARpMN9w=",
- "origin": "github.com/docker/docker/vendor/github.com/docker/go-connections/nat",
- "path": "github.com/docker/go-connections/nat",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
- "checksumSHA1": "jUfDG3VQsA2UZHvvIXncgiddpYA=",
- "origin": "github.com/docker/docker/vendor/github.com/docker/go-connections/sockets",
- "path": "github.com/docker/go-connections/sockets",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
- "checksumSHA1": "tuSzlS1UQ03+5Fvtqr5hI5sLLhA=",
- "origin": "github.com/docker/docker/vendor/github.com/docker/go-connections/tlsconfig",
- "path": "github.com/docker/go-connections/tlsconfig",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
- "checksumSHA1": "Pv1NbtDY4wETwwSD2DsI+s8de/I=",
- "origin": "github.com/docker/docker/vendor/github.com/docker/go-units",
- "path": "github.com/docker/go-units",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
- "checksumSHA1": "r5hHPg1v9SL/gyatPWdaujG9aoE=",
- "origin": "github.com/docker/docker/vendor/github.com/docker/libtrust",
- "path": "github.com/docker/libtrust",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
"checksumSHA1": "ImX1uv6O09ggFeBPUJJ2nu7MPSA=",
"path": "github.com/ghodss/yaml",
"revision": "0ca9ea5df5451ffdf184b4428c902747c2c11cd7",
@@ -263,16 +172,15 @@
},
{
"checksumSHA1": "iIUYZyoanCQQTUaWsu8b+iOSPt4=",
- "origin": "github.com/docker/docker/vendor/github.com/gorilla/context",
"path": "github.com/gorilla/context",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
+ "revision": "14f550f51af52180c2eefed15e5fd18d63c0a64a",
+ "revisionTime": "2014-06-04T16:11:50Z"
},
{
- "checksumSHA1": "zmCk+lgIeiOf0Ng9aFP9aFy8ksE=",
+ "checksumSHA1": "oKhpvaXBVmGKk8dvCXXzUtPqyMM=",
"path": "github.com/gorilla/mux",
- "revision": "4c1c3952b7d9d0a061a3fa7b36fd373ba0398ebc",
- "revisionTime": "2017-04-27T04:12:50Z"
+ "revision": "14cafe28513321476c73967a5a4f3454b6129c46",
+ "revisionTime": "2014-06-24T18:46:26Z"
},
{
"checksumSHA1": "uTUsjF7bymOuKvXbW2BpkK/w4Vg=",
@@ -281,19 +189,12 @@
"revisionTime": "2017-03-24T20:46:54Z"
},
{
- "checksumSHA1": "Gk3jTNQ5uGDUE0WMJFWcYz9PMps=",
+ "checksumSHA1": "q5SZBWFVC3wOIzftf+l/h5WLG1k=",
"path": "github.com/lib/pq/oid",
"revision": "2704adc878c21e1329f46f6e56a1c387d788ff94",
"revisionTime": "2017-03-24T20:46:54Z"
},
{
- "checksumSHA1": "OUupkCHnh8e3RHRNcMFqQJqhaQI=",
- "origin": "github.com/docker/docker/vendor/github.com/opencontainers/go-digest",
- "path": "github.com/opencontainers/go-digest",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
"checksumSHA1": "qzsBSt0cnEYNIkYk7slHjmPl7o0=",
"path": "github.com/opencontainers/image-spec/specs-go",
"revision": "f03dbe35d449c54915d235f1a3cf8f585a24babe",
@@ -306,58 +207,34 @@
"revisionTime": "2017-05-15T20:58:57Z"
},
{
- "checksumSHA1": "PdQm3s8DoVJ17Vk8n7o5iPa7PK0=",
- "origin": "github.com/docker/docker/vendor/github.com/pkg/errors",
- "path": "github.com/pkg/errors",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
- "checksumSHA1": "9jjO5GjLa0XF/nfWihF02RoH4qc=",
- "origin": "github.com/docker/docker/vendor/golang.org/x/net/context",
+ "checksumSHA1": "Y+HGqEkYM15ir+J93MEaHdyFy0c=",
"path": "golang.org/x/net/context",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
+ "revision": "054b33e6527139ad5b1ec2f6232c3b175bd9a30c",
+ "revisionTime": "2017-07-05T22:25:54Z"
},
{
"checksumSHA1": "WHc3uByvGaMcnSoI21fhzYgbOgg=",
- "origin": "github.com/docker/docker/vendor/golang.org/x/net/context/ctxhttp",
"path": "golang.org/x/net/context/ctxhttp",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
+ "revision": "054b33e6527139ad5b1ec2f6232c3b175bd9a30c",
+ "revisionTime": "2017-07-05T22:25:54Z"
},
{
- "checksumSHA1": "LvdVRE0FqdR68SvVpRkHs1rxhcA=",
- "origin": "github.com/docker/docker/vendor/golang.org/x/net/proxy",
+ "checksumSHA1": "N1BVY98+YTHORzLmtlBGpJBA4Tk=",
"path": "golang.org/x/net/proxy",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
+ "revision": "054b33e6527139ad5b1ec2f6232c3b175bd9a30c",
+ "revisionTime": "2017-07-05T22:25:54Z"
},
{
"checksumSHA1": "7EZyXN0EmZLgGxZxK01IJua4c8o=",
"path": "golang.org/x/net/websocket",
- "revision": "513929065c19401a1c7b76ecd942f9f86a0c061b",
- "revisionTime": "2017-05-12T22:20:15Z"
- },
- {
- "checksumSHA1": "ENl6I8+3AaBanbn9CVExMjDTHPc=",
- "origin": "github.com/docker/docker/vendor/golang.org/x/sys/unix",
- "path": "golang.org/x/sys/unix",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
- },
- {
- "checksumSHA1": "fpW2dhGFC6SrVzipJx7fjg2DIH8=",
- "origin": "github.com/docker/docker/vendor/golang.org/x/sys/windows",
- "path": "golang.org/x/sys/windows",
- "revision": "280327cb4d1e1fe4f118d00596ce0b3a6ae6d07e",
- "revisionTime": "2017-05-17T20:48:28Z"
+ "revision": "054b33e6527139ad5b1ec2f6232c3b175bd9a30c",
+ "revisionTime": "2017-07-05T22:25:54Z"
},
{
- "checksumSHA1": "CEFTYXtWmgSh+3Ik1NmDaJcz4E0=",
+ "checksumSHA1": "x7V7axPaHuRw5cruBn79MMtXw1g=",
"path": "gopkg.in/check.v1",
- "revision": "20d25e2804050c1cd24a7eea1e7a6447dd0e74ec",
- "revisionTime": "2016-12-08T18:13:25Z"
+ "revision": "b3d3430320d4260e5fea99841af984b3badcea63",
+ "revisionTime": "2015-06-26T10:50:28Z"
},
{
"checksumSHA1": "fALlQNY1fM99NesfLJ50KguWsio=",
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list