Merge branch 'master' into 4227-date-display

Conflicts:
	apps/workbench/test/integration/projects_test.rb

diff --combined apps/workbench/test/integration/projects_test.rb
index a6e8ec4101089f75e4ee89853da29b59ed00e6c3,1041544d78e42cbc997e64770df7330db5dfd024..7f10e45a762f58d270a079f339e793a1517b52cc
--- 1/apps/workbench/test/integration/projects_test.rb
--- 2/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@@ -549,7 -549,7 +549,7 @@@ class ProjectsTest < ActionDispatch::In
  
    [
      ['project with 10 pipelines', 10, 0],
-     ['project with 2 pipelines and 200 jobs', 2, 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
@@@ -563,7 -563,7 +563,7 @@@
        find(".dropdown-menu a", text: project_name).click
  
        my_pipelines = []
 -      (1..num_pipelines).each do |i|
 +      (0..num_pipelines-1).each do |i|
          name = "pipeline_#{i}"
          my_pipelines << name
        end