[ARVADOS] updated: 96cc8940e7926453f4728c5aec1374e7b99db201

[Git user]

Summary of changes:
 apps/workbench/app/models/container_work_unit.rb   |  19 +-
 apps/workbench/app/models/job.rb                   |   3 +-
 apps/workbench/app/models/proxy_work_unit.rb       |   9 +
 .../app/views/work_units/_show_child.html.erb      |   4 +-
 .../app/views/work_units/_show_component.html.erb  |  64 +++----
 .../test/integration/application_layout_test.rb    |  75 --------
 .../test/integration/container_requests_test.rb    |   4 +-
 apps/workbench/test/integration/websockets_test.rb | 200 +++++++++------------
 apps/workbench/test/integration/work_units_test.rb |  73 ++++++++
 apps/workbench/test/test_helper.rb                 |   8 +-
 apps/workbench/test/unit/work_unit_test.rb         |  14 ++
 .../arvados/v1/container_requests_controller.rb    |   1 +
 services/api/app/models/arvados_model.rb           |  86 ++++-----
 services/api/app/models/container.rb               |  14 ++
 services/api/app/models/log.rb                     |  18 ++
 services/api/lib/eventbus.rb                       |   2 +-
 services/api/lib/simulate_job_log.rb               |   3 +
 services/api/test/fixtures/container_requests.yml  |  21 ++-
 services/api/test/fixtures/containers.yml          |  19 +-
 services/api/test/fixtures/logs.yml                |   4 +-
 services/api/test/integration/permissions_test.rb  |  10 +-
 services/api/test/integration/websocket_test.rb    |  60 +++----
 services/api/test/unit/container_request_test.rb   |   6 +
 services/api/test/unit/log_test.rb                 |   3 +-
 services/api/test/unit/permission_test.rb          |  23 +++
 25 files changed, 394 insertions(+), 349 deletions(-)

       via  96cc8940e7926453f4728c5aec1374e7b99db201 (commit)
       via  27680aebaeff734ce65f7385b0e150a39dc1653b (commit)
       via  dcb6eaa5012bf1eea607c61209bee18723769c24 (commit)
       via  af0ece600054c97aae9661ed06731af47873a7ff (commit)
       via  16e1811a346d7ed20999a6f6420c7a57937dbd09 (commit)
       via  dcf7f7d492830f11b58e691d127849c6781c8244 (commit)
       via  3090a8d0b4020b291bf34958680e3cf4cd0b8c21 (commit)
       via  730eb182b2160040a902feb09276b75a3f9c137c (commit)
       via  415cb3b63e8cfafd4c6b92a8971a0cff74097337 (commit)
       via  2cc397021b57dc43449730f4d13ac99d4e6be41d (commit)
       via  a1c3389d7fe54a7311609e7f74b5a9b3ea825c94 (commit)
       via  694836fc68fbe6414d5248b48889ea3be1c33b75 (commit)
       via  203cf7998836c7a00cfad2eeaf59b59f07d8e3ed (commit)
       via  262a16e15c0dcfa9245e9c8fd88d383f54f51471 (commit)
       via  661399e4fd26be1a932d94d0b2c419cd3a33a4f1 (commit)
       via  9fd1f52e97c96f9a0a0fc76b37520828f0d9221d (commit)
       via  5497c52dae7a3832e75d8e414492d48df1192ddc (commit)
       via  3d53281b9e3ba0840e5e3eaeb0371e0f50a345ad (commit)
       via  61ee10791b2b1f3724e6a8736c93161a625b5246 (commit)
       via  87cb6b04df6f71d5bce9b0b3c1257e0b5082668d (commit)
       via  2bc21107e3fa6c4ecea7efb22e4dfc7e30b3233d (commit)
       via  71ec472aa11b47a58beb3b050fee38244674869e (commit)
       via  579195def22d6b02f7484933d6db065bc33088d9 (commit)
       via  08224a6abb60ff61f3967abc9665f50f9157791b (commit)
       via  08262a4e18c0b3b65946878058e9546823b82535 (commit)
       via  95e6adc8ac2c9449aba651ef0d932cd7d27aea5e (commit)
      from  d5ebfb1d35d2458742c545af4ee16c9f14de08bb (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 96cc8940e7926453f4728c5aec1374e7b99db201
Merge: 27680ae dcb6eaa
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Sep 5 16:19:31 2016 -0400

    Merge branch '9799-nonadmin-logs'
    
    closes #9799


commit 27680aebaeff734ce65f7385b0e150a39dc1653b
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Sep 5 16:19:06 2016 -0400

    9931: Fix missing include in workbench test support.
    
    refs #9931

diff --git a/services/api/lib/simulate_job_log.rb b/services/api/lib/simulate_job_log.rb
index 860513f..0ad543e 100644
--- a/services/api/lib/simulate_job_log.rb
+++ b/services/api/lib/simulate_job_log.rb
@@ -1,4 +1,7 @@
+require 'current_api_client'
+
 module SimulateJobLog
+  include CurrentApiClient
   def replay(filename, multiplier = 1, simulated_job_uuid = nil)
     raise "Environment must be development or test" unless [ 'test', 'development' ].include? ENV['RAILS_ENV']
 

-----------------------------------------------------------------------


hooks/post-receive
--