[ARVADOS] updated: 08c2cb0e56cb9e457ebaf554bab5f6b8317c1e71
Git user
git at public.curoverse.com
Wed Aug 24 14:34:26 EDT 2016
Summary of changes:
apps/workbench/Gemfile | 5 +
apps/workbench/Gemfile.lock | 12 ++
.../app/controllers/collections_controller.rb | 7 -
apps/workbench/app/views/collections/show.html.erb | 40 +-----
apps/workbench/config/initializers/lograge.rb | 14 ++
apps/workbench/config/load_config.rb | 2 +-
.../controllers/collections_controller_test.rb | 7 -
.../collections_perf_test.rb | 4 +-
build/go-package-scripts/postinst | 31 +++++
build/go-package-scripts/prerm | 19 +++
build/run-build-docker-images.sh | 8 +-
build/run-library.sh | 13 +-
sdk/cwl/test_with_arvbox.sh | 4 +-
services/api/Gemfile | 2 +
services/api/Gemfile.lock | 10 ++
.../app/controllers/arvados/v1/jobs_controller.rb | 153 +++++++++++----------
services/api/app/models/job.rb | 20 +++
services/api/config/initializers/load_config.rb | 2 +-
services/api/config/initializers/lograge.rb | 14 ++
...9195557_add_script_parameters_digest_to_jobs.rb | 6 +
...0819195725_populate_script_parameters_digest.rb | 21 +++
services/api/db/structure.sql | 16 ++-
services/api/test/fixtures/jobs.yml | 28 ++++
.../arvados/v1/job_reuse_controller_test.rb | 4 +-
services/api/test/unit/job_test.rb | 16 +++
.../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 7 +-
.../crunch-dispatch-slurm.service | 12 ++
27 files changed, 341 insertions(+), 136 deletions(-)
create mode 100644 apps/workbench/config/initializers/lograge.rb
create mode 100755 build/go-package-scripts/postinst
create mode 100755 build/go-package-scripts/prerm
create mode 100644 services/api/config/initializers/lograge.rb
create mode 100644 services/api/db/migrate/20160819195557_add_script_parameters_digest_to_jobs.rb
create mode 100644 services/api/db/migrate/20160819195725_populate_script_parameters_digest.rb
create mode 100644 services/crunch-dispatch-slurm/crunch-dispatch-slurm.service
via 08c2cb0e56cb9e457ebaf554bab5f6b8317c1e71 (commit)
via 47502d42694c53a59fc92f2667f6a1844229e87d (commit)
via d18557927ac033c2e33c1f7770881367b252f329 (commit)
via f6a485f2af3665d66d93621d3e0c40ee3e541eef (commit)
via e18a2167616da4d45fa3314df55483c4b1862240 (commit)
via 9192507c4d15cd083231d16331c96bd197c79cec (commit)
via 44af40bbc9c3617100d7360809275140ac7b7cd2 (commit)
via d25acd6794de48d6927cd5d6250cedef3ba4e2d1 (commit)
via 7d4f5d69a2dced1bb0c807da46a791e094a8cc47 (commit)
via 382f262d2c9c2c104808fa4bb38fb395e28c85bc (commit)
via 3ffd38b8e0792fc68be55d954cd65ab32f64586a (commit)
via 369b6de63a042bd7b0a95a5510f0260a314c2361 (commit)
via 8382fe1d7ee8c0c050873c05f0702d35c5e1305f (commit)
via ffc0c0768c4d2dc9aae3d4e3be3cb5584e42a4ba (commit)
via 1c258a38bf9170704728c10d42cdb31f286137d3 (commit)
via 897f8c02f36454c6627d0c5fb78c6adb03137a28 (commit)
via 5c30ff39945f72a633db91b52ba881ac5b02f762 (commit)
via 282d1464bdc2584d69a2a7734106acc67d6a16e6 (commit)
via bfccffd3ca2ea0ee4c129f52f8a1907c973f3951 (commit)
via 321b2b5486a7e64527eae9718c54425de9285d7c (commit)
via a786d20e2ac2dbc5fd78a6100b23e391ddb3ce32 (commit)
via 69e7b5b364a3e4708325ec214d8d3117095491fd (commit)
via 4c47283466981a99d27467c086d49a2235f5d0c2 (commit)
via 9d3c5bef462c95d52ff61693cce49d435461367f (commit)
via 3f23d6fdf6fd1808249840a3635c1afe47726dfe (commit)
via 4b7c0f2aa4da6fdb25419a24d1a7f5b57ab35bfd (commit)
via 1356cd61457b8a48ed879b97c5cd14eb4ccf0f29 (commit)
via 6b2ee0dd59e39307649b72940824ceafada35fac (commit)
via 7ffda8eec81106fe7d017f8fdb67ef1fa1a0f761 (commit)
from 1ca9bf45642e126cd3433fc0474e917ffd55b49d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 08c2cb0e56cb9e457ebaf554bab5f6b8317c1e71
Author: radhika <radhika at curoverse.com>
Date: Wed Aug 24 14:19:03 2016 -0400
9767: add safe_yaml gem to workbench and update load_config
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index db569c9..20d64d1 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -96,3 +96,5 @@ gem 'raphael-rails'
gem 'lograge'
gem 'logstash-event'
+
+gem 'safe_yaml'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 03bbbce..a8431a7 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -216,6 +216,7 @@ GEM
rubyzip (1.1.7)
rvm-capistrano (1.5.5)
capistrano (~> 2.15.4)
+ safe_yaml (1.0.4)
sass (3.4.9)
sass-rails (5.0.1)
railties (>= 4.0.0, < 5.0)
@@ -306,6 +307,7 @@ DEPENDENCIES
ruby-debug-passenger
ruby-prof
rvm-capistrano
+ safe_yaml
sass
sass-rails
selenium-webdriver
diff --git a/apps/workbench/config/load_config.rb b/apps/workbench/config/load_config.rb
index f14c3ca..95f6edc 100644
--- a/apps/workbench/config/load_config.rb
+++ b/apps/workbench/config/load_config.rb
@@ -7,7 +7,7 @@ $application_config = {}
path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
if File.exists? path
yaml = ERB.new(IO.read path).result(binding)
- confs = YAML.load(yaml)
+ confs = YAML.load(yaml, deserialize_symbols: true)
$application_config.merge!(confs['common'] || {})
$application_config.merge!(confs[::Rails.env.to_s] || {})
end
commit 47502d42694c53a59fc92f2667f6a1844229e87d
Merge: 1ca9bf4 d185579
Author: radhika <radhika at curoverse.com>
Date: Wed Aug 24 14:13:07 2016 -0400
Merge branch 'master' into 9767-workflows-in-chooser
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list