Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

4 files changed, 15 insertions, 7 deletions

diff --git a/app/helpers/ci/jobs_helper.rb b/app/helpers/ci/jobs_helper.rb
index a0d169c1358..23f2a082a68 100644
--- a/app/helpers/ci/jobs_helper.rb
+++ b/app/helpers/ci/jobs_helper.rb
@@ -15,7 +15,8 @@ module Ci
         "build_stage" => @build.stage,
         "log_state" => '',
         "build_options" => javascript_build_options,
-        "retry_outdated_job_docs_url" => help_page_path('ci/pipelines/settings', anchor: 'retry-outdated-jobs')
+        "retry_outdated_job_docs_url" => help_page_path('ci/pipelines/settings', anchor: 'retry-outdated-jobs'),
+        "code_quality_help_url" => help_page_path('user/project/merge_requests/code_quality', anchor: 'troubleshooting')
       }
     end
 
@@ -36,4 +37,4 @@ module Ci
   end
 end
 
-Ci::JobsHelper.prepend_if_ee('::EE::Ci::JobsHelper')
+Ci::JobsHelper.prepend_mod_with('Ci::JobsHelper')
diff --git a/app/helpers/ci/pipeline_editor_helper.rb b/app/helpers/ci/pipeline_editor_helper.rb
index ceb18d90c92..8c8ee2d4d0f 100644
--- a/app/helpers/ci/pipeline_editor_helper.rb
+++ b/app/helpers/ci/pipeline_editor_helper.rb
@@ -9,21 +9,29 @@ module Ci
     end
 
     def js_pipeline_editor_data(project)
+      commit_sha = project.commit ? project.commit.sha : ''
       {
         "ci-config-path": project.ci_config_path_or_default,
-        "commit-sha" => project.commit ? project.commit.sha : '',
+        "ci-examples-help-page-path" => help_page_path('ci/examples/README'),
+        "ci-help-page-path" => help_page_path('ci/README'),
+        "commit-sha" => commit_sha,
         "default-branch" => project.default_branch,
         "empty-state-illustration-path" => image_path('illustrations/empty-state/empty-dag-md.svg'),
         "initial-branch-name": params[:branch_name],
         "lint-help-page-path" => help_page_path('ci/lint', anchor: 'validate-basic-logic-and-syntax'),
+        "needs-help-page-path" => help_page_path('ci/yaml/README', anchor: 'needs'),
         "new-merge-request-path" => namespace_project_new_merge_request_path,
+        "pipeline_etag" => project.commit ? graphql_etag_pipeline_sha_path(commit_sha) : '',
+        "pipeline-page-path" => project_pipelines_path(project),
         "project-path" => project.path,
         "project-full-path" => project.full_path,
         "project-namespace" => project.namespace.full_path,
+        "runner-help-page-path" => help_page_path('ci/runners/README'),
+        "total-branches" => project.repository.branches.length,
         "yml-help-page-path" => help_page_path('ci/yaml/README')
       }
     end
   end
 end
 
-Ci::PipelineEditorHelper.prepend_if_ee('EE::Ci::PipelineEditorHelper')
+Ci::PipelineEditorHelper.prepend_mod_with('Ci::PipelineEditorHelper')
diff --git a/app/helpers/ci/pipelines_helper.rb b/app/helpers/ci/pipelines_helper.rb
index cabb43f45fd..f42cd53ae3a 100644
--- a/app/helpers/ci/pipelines_helper.rb
+++ b/app/helpers/ci/pipelines_helper.rb
@@ -50,10 +50,9 @@ module Ci
         { name: 'Gradle', logo: image_path('illustrations/logos/gradle.svg') },
         { name: 'Grails', logo: image_path('illustrations/logos/grails.svg') },
         { name: 'dotNET', logo: image_path('illustrations/logos/dotnet.svg') },
-        { name: 'Rails', logo: image_path('illustrations/logos/rails.svg') },
         { name: 'Julia', logo: image_path('illustrations/logos/julia.svg') },
         { name: 'Laravel', logo: image_path('illustrations/logos/laravel.svg') },
-        { name: 'Latex', logo: image_path('illustrations/logos/latex.svg') },
+        { name: 'LaTeX', logo: image_path('illustrations/logos/latex.svg') },
         { name: 'Maven', logo: image_path('illustrations/logos/maven.svg') },
         { name: 'Mono', logo: image_path('illustrations/logos/mono.svg') },
         { name: 'Nodejs', logo: image_path('illustrations/logos/node_js.svg') },
diff --git a/app/helpers/ci/runners_helper.rb b/app/helpers/ci/runners_helper.rb
index 82347053d6f..550fa4de2c5 100644
--- a/app/helpers/ci/runners_helper.rb
+++ b/app/helpers/ci/runners_helper.rb
@@ -75,4 +75,4 @@ module Ci
   end
 end
 
-Ci::RunnersHelper.prepend_if_ee('EE::Ci::RunnersHelper')
+Ci::RunnersHelper.prepend_mod_with('Ci::RunnersHelper')