Add latest changes from gitlab-org/gitlab@13-2-stable-ee

6 files changed, 325 insertions, 0 deletions

diff --git a/app/helpers/ci/builds_helper.rb b/app/helpers/ci/builds_helper.rb
new file mode 100644
index 00000000000..bfdb830f2c3
--- /dev/null
+++ b/app/helpers/ci/builds_helper.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Ci
+  module BuildsHelper
+    def build_summary(build, skip: false)
+      if build.has_trace?
+        if skip
+          link_to _('View job log'), pipeline_job_url(build.pipeline, build)
+        else
+          build.trace.html(last_lines: 10).html_safe
+        end
+      else
+        _('No job log')
+      end
+    end
+
+    def sidebar_build_class(build, current_build)
+      build_class = []
+      build_class << 'active' if build.id === current_build.id
+      build_class << 'retried' if build.retried?
+      build_class.join(' ')
+    end
+
+    def javascript_build_options
+      {
+        page_path: project_job_path(@project, @build),
+        build_status: @build.status,
+        build_stage: @build.stage,
+        log_state: ''
+      }
+    end
+
+    def build_failed_issue_options
+      {
+        title: _("Job Failed #%{build_id}") % { build_id: @build.id },
+        description: project_job_url(@project, @build)
+      }
+    end
+  end
+end
diff --git a/app/helpers/ci/jobs_helper.rb b/app/helpers/ci/jobs_helper.rb
new file mode 100644
index 00000000000..0344413b849
--- /dev/null
+++ b/app/helpers/ci/jobs_helper.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Ci
+  module JobsHelper
+    def jobs_data
+      {
+        "endpoint" => project_job_path(@project, @build, format: :json),
+        "project_path" => @project.full_path,
+        "deployment_help_url" => help_page_path('user/project/clusters/index.html', anchor: 'troubleshooting'),
+        "runner_help_url" => help_page_path('ci/runners/README.html', anchor: 'set-maximum-job-timeout-for-a-runner'),
+        "runner_settings_url" => project_runners_path(@build.project, anchor: 'js-runners-settings'),
+        "variables_settings_url" => project_variables_path(@build.project, anchor: 'js-cicd-variables-settings'),
+        "page_path" => project_job_path(@project, @build),
+        "build_status" => @build.status,
+        "build_stage" => @build.stage,
+        "log_state" => '',
+        "build_options" => javascript_build_options
+      }
+    end
+  end
+end
+
+Ci::JobsHelper.prepend_if_ee('::EE::Ci::JobsHelper')
diff --git a/app/helpers/ci/pipeline_schedules_helper.rb b/app/helpers/ci/pipeline_schedules_helper.rb
new file mode 100644
index 00000000000..20e5c90a60e
--- /dev/null
+++ b/app/helpers/ci/pipeline_schedules_helper.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Ci
+  module PipelineSchedulesHelper
+    def timezone_data
+      ActiveSupport::TimeZone.all.map do |timezone|
+        {
+          name: timezone.name,
+          offset: timezone.now.utc_offset,
+          identifier: timezone.tzinfo.identifier
+        }
+      end
+    end
+  end
+end
diff --git a/app/helpers/ci/runners_helper.rb b/app/helpers/ci/runners_helper.rb
new file mode 100644
index 00000000000..8cdb28b2874
--- /dev/null
+++ b/app/helpers/ci/runners_helper.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Ci
+  module RunnersHelper
+    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"
+
+      when :online, :offline, :paused
+        content_tag :i, nil,
+                    class: "fa fa-circle runner-status-#{status}",
+                    title: "Runner is #{status}, last contact was #{time_ago_in_words(runner.contacted_at)} ago"
+      end
+    end
+
+    def runner_link(runner)
+      display_name = truncate(runner.display_name, length: 15)
+      id = "\##{runner.id}"
+
+      if current_user && current_user.admin
+        link_to admin_runner_path(runner) do
+          display_name + id
+        end
+      else
+        display_name + id
+      end
+    end
+
+    # Due to inability of performing sorting of runners by cached "contacted_at" values we have to show uncached values if sorting by "contacted_asc" is requested.
+    # Please refer to the following issue for more details: https://gitlab.com/gitlab-org/gitlab-foss/issues/55920
+    def runner_contacted_at(runner)
+      if params[:sort] == 'contacted_asc'
+        runner.uncached_contacted_at
+      else
+        runner.contacted_at
+      end
+    end
+  end
+end
+
+Ci::RunnersHelper.prepend_if_ee('EE::Ci::RunnersHelper')
diff --git a/app/helpers/ci/status_helper.rb b/app/helpers/ci/status_helper.rb
new file mode 100644
index 00000000000..bca49324a19
--- /dev/null
+++ b/app/helpers/ci/status_helper.rb
@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+##
+# DEPRECATED
+#
+# These helpers are deprecated in favor of detailed CI/CD statuses.
+#
+# See 'detailed_status?` method and `Gitlab::Ci::Status` module.
+#
+module Ci
+  module StatusHelper
+    def ci_label_for_status(status)
+      if detailed_status?(status)
+        return status.label
+      end
+
+      label = case status
+              when 'success'
+                'passed'
+              when 'success-with-warnings'
+                'passed with warnings'
+              when 'manual'
+                'waiting for manual action'
+              when 'scheduled'
+                'waiting for delayed job'
+              else
+                status
+              end
+      translation = "CiStatusLabel|#{label}"
+      s_(translation)
+    end
+
+    def ci_text_for_status(status)
+      if detailed_status?(status)
+        return status.text
+      end
+
+      case status
+      when 'success'
+        s_('CiStatusText|passed')
+      when 'success-with-warnings'
+        s_('CiStatusText|passed')
+      when 'manual'
+        s_('CiStatusText|blocked')
+      when 'scheduled'
+        s_('CiStatusText|delayed')
+      else
+        # All states are already being translated inside the detailed statuses:
+        # :running => Gitlab::Ci::Status::Running
+        # :skipped => Gitlab::Ci::Status::Skipped
+        # :failed => Gitlab::Ci::Status::Failed
+        # :success => Gitlab::Ci::Status::Success
+        # :canceled => Gitlab::Ci::Status::Canceled
+        # The following states are customized above:
+        # :manual => Gitlab::Ci::Status::Manual
+        status_translation = "CiStatusText|#{status}"
+        s_(status_translation)
+      end
+    end
+
+    def ci_status_for_statuseable(subject)
+      status = subject.try(:status) || 'not found'
+      status.humanize
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def ci_icon_for_status(status, size: 16)
+      if detailed_status?(status)
+        return sprite_icon(status.icon, size: size)
+      end
+
+      icon_name =
+        case status
+        when 'success'
+          'status_success'
+        when 'success-with-warnings'
+          'status_warning'
+        when 'failed'
+          'status_failed'
+        when 'pending'
+          'status_pending'
+        when 'waiting_for_resource'
+          'status_pending'
+        when 'preparing'
+          'status_preparing'
+        when 'running'
+          'status_running'
+        when 'play'
+          'play'
+        when 'created'
+          'status_created'
+        when 'skipped'
+          'status_skipped'
+        when 'manual'
+          'status_manual'
+        when 'scheduled'
+          'status_scheduled'
+        else
+          'status_canceled'
+        end
+
+      sprite_icon(icon_name, size: size)
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+
+    def ci_icon_class_for_status(status)
+      group = detailed_status?(status) ? status.group : status.dasherize
+
+      "ci-status-icon-#{group}"
+    end
+
+    def pipeline_status_cache_key(pipeline_status)
+      "pipeline-status/#{pipeline_status.sha}-#{pipeline_status.status}"
+    end
+
+    def render_commit_status(commit, status, ref: nil, tooltip_placement: 'left')
+      project = commit.project
+      path = pipelines_project_commit_path(project, commit, ref: ref)
+
+      render_status_with_link(
+        status,
+        path,
+        tooltip_placement: tooltip_placement,
+        icon_size: 24)
+    end
+
+    def render_status_with_link(status, path = nil, type: _('pipeline'), tooltip_placement: 'left', cssclass: '', container: 'body', icon_size: 16)
+      klass = "ci-status-link #{ci_icon_class_for_status(status)} d-inline-flex #{cssclass}"
+      title = "#{type.titleize}: #{ci_label_for_status(status)}"
+      data = { toggle: 'tooltip', placement: tooltip_placement, container: container }
+
+      if path
+        link_to ci_icon_for_status(status, size: icon_size), path,
+                class: klass, title: title, data: data
+      else
+        content_tag :span, ci_icon_for_status(status, size: icon_size),
+                class: klass, title: title, data: data
+      end
+    end
+
+    def detailed_status?(status)
+      status.respond_to?(:text) &&
+        status.respond_to?(:group) &&
+        status.respond_to?(:label) &&
+        status.respond_to?(:icon)
+    end
+  end
+end
diff --git a/app/helpers/ci/variables_helper.rb b/app/helpers/ci/variables_helper.rb
new file mode 100644
index 00000000000..b20390d58e9
--- /dev/null
+++ b/app/helpers/ci/variables_helper.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Ci
+  module VariablesHelper
+    def ci_variable_protected_by_default?
+      Gitlab::CurrentSettings.current_application_settings.protected_ci_variables
+    end
+
+    def create_deploy_token_path(entity, opts = {})
+      if entity.is_a?(::Group)
+        create_deploy_token_group_settings_repository_path(entity, opts)
+      else
+        # TODO: change this path to 'create_deploy_token_project_settings_ci_cd_path'
+        # See MR comment for more detail: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27059#note_311585356
+        create_deploy_token_project_settings_repository_path(entity, opts)
+      end
+    end
+
+    def revoke_deploy_token_path(entity, token)
+      if entity.is_a?(::Group)
+        revoke_group_deploy_token_path(entity, token)
+      else
+        revoke_project_deploy_token_path(entity, token)
+      end
+    end
+
+    def ci_variable_protected?(variable, only_key_value)
+      if variable && !only_key_value
+        variable.protected
+      else
+        ci_variable_protected_by_default?
+      end
+    end
+
+    def ci_variable_masked?(variable, only_key_value)
+      if variable && !only_key_value
+        variable.masked
+      else
+        false
+      end
+    end
+
+    def ci_variable_type_options
+      [
+        %w(Variable env_var),
+        %w(File file)
+      ]
+    end
+
+    def ci_variable_maskable_regex
+      Ci::Maskable::REGEX.inspect.sub('\\A', '^').sub('\\z', '$').sub(/^\//, '').sub(/\/[a-z]*$/, '').gsub('\/', '/')
+    end
+  end
+end