Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

3 files changed, 19 insertions, 4 deletions

diff --git a/app/helpers/ci/jobs_helper.rb b/app/helpers/ci/jobs_helper.rb
index e876eb64029..d47f6195c61 100644
--- a/app/helpers/ci/jobs_helper.rb
+++ b/app/helpers/ci/jobs_helper.rb
@@ -15,7 +15,8 @@ module Ci
         "build_status" => @build.status,
         "build_stage" => @build.stage,
         "log_state" => '',
-        "build_options" => javascript_build_options
+        "build_options" => javascript_build_options,
+        "retry_outdated_job_docs_url" => help_page_path('ci/pipelines/settings', anchor: 'retry-outdated-jobs')
       }
     end
   end
diff --git a/app/helpers/ci/pipeline_editor_helper.rb b/app/helpers/ci/pipeline_editor_helper.rb
new file mode 100644
index 00000000000..3f48b2687b9
--- /dev/null
+++ b/app/helpers/ci/pipeline_editor_helper.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Ci
+  module PipelineEditorHelper
+    include ChecksCollaboration
+
+    def can_view_pipeline_editor?(project)
+      can_collaborate_with_project?(project) &&
+        Gitlab::Ci::Features.ci_pipeline_editor_page_enabled?(project)
+    end
+  end
+end
diff --git a/app/helpers/ci/runners_helper.rb b/app/helpers/ci/runners_helper.rb
index 552acf61f47..432aad663e4 100644
--- a/app/helpers/ci/runners_helper.rb
+++ b/app/helpers/ci/runners_helper.rb
@@ -2,13 +2,15 @@
 
 module Ci
   module RunnersHelper
+    include IconsHelper
+
     def runner_status_icon(runner)
       status = runner.status
       case status
       when :not_connected
-        content_tag :i, nil,
-                    class: "fa fa-warning",
-                    title: "New runner. Has not connected yet"
+        content_tag(:span, title: "New runner. Has not connected yet") do
+          sprite_icon("warning-solid", size: 24, css_class: "gl-vertical-align-bottom!")
+        end
 
       when :online, :offline, :paused
         content_tag :i, nil,