[ARVADOS] updated: 7d7e23d01f1d00edf49ba50ded5ffe8054691ada

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/projects/_show_sharing.html.erb | 10 +++++++++-
 apps/workbench/test/integration/projects_test.rb         |  9 ++++++---
 services/api/test/fixtures/pipeline_instances.yml        |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

       via  7d7e23d01f1d00edf49ba50ded5ffe8054691ada (commit)
       via  24ea674969edba33f63921c14dff62192634807c (commit)
       via  e0f182c242423c10783357b5d722511b765033fe (commit)
       via  1bb0592a2fd043b09ab9845cfc25dbdffff1c009 (commit)
       via  55cc27092078a78847a2b0230e8782c744e7fff2 (commit)
       via  aa2245a2770dac18a1c26af33cae3e24b3e656ab (commit)
       via  554b4b8821b2eed4c1ce5064e20d043465b571ba (commit)
      from  1a3d59cd7aa80a4ed6ec72aca1633edcbb788880 (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 7d7e23d01f1d00edf49ba50ded5ffe8054691ada
Merge: 1a3d59c 24ea674
Author: radhika <radhika at curoverse.com>
Date:   Tue Oct 21 12:56:33 2014 -0400

    closes #4054
    Merge branch '4054-sharing-email'


commit 24ea674969edba33f63921c14dff62192634807c
Author: radhika <radhika at curoverse.com>
Date:   Tue Oct 21 12:54:32 2014 -0400

    4091: the test with 200 jobs and 10 pipelines is failing in jenkins env. reduce the number of pipelines to 2 to see if shorter runtime helps.

diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 3471796..cccfd99 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -549,7 +549,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
 
   [
     ['project with 10 pipelines', 10, 0],
-    ['project with 200 jobs and 10 pipelines', 10, 200],
+    ['project with 200 jobs and 10 pipelines', 2, 200],
     ['project with 25 pipelines', 25, 0],
   ].each do |project_name, num_pipelines, num_jobs|
     test "scroll pipeline instances tab for #{project_name} with #{num_pipelines} pipelines and #{num_jobs} jobs" do
diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml
index fd616cd..e8e7e5d 100644
--- a/services/api/test/fixtures/pipeline_instances.yml
+++ b/services/api/test/fixtures/pipeline_instances.yml
@@ -174,7 +174,7 @@ pipeline_<%=i%>_of_10:
 <% end %>
 
 # pipelines in project_with_10_pipelines_and_200_jobs
-<% for i in 1..10 do %>
+<% for i in 1..2 do %>
 pipeline_<%=i%>_of_10_pipelines_and_200_jobs:
   name: pipeline_<%= i %>
   state: New

commit e0f182c242423c10783357b5d722511b765033fe
Merge: 1bb0592 1a3d59c
Author: radhika <radhika at curoverse.com>
Date:   Tue Oct 21 12:48:35 2014 -0400

    Merge branch 'master' into 4054-sharing-email


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


hooks/post-receive
--