diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 09:16:11 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 09:16:11 +0000 |
commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /app/helpers/ci | |
parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) | |
download | gitlab-ce-edaa33dee2ff2f7ea3fac488d41558eb5f86d68c.tar.gz |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'app/helpers/ci')
-rw-r--r-- | app/helpers/ci/jobs_helper.rb | 8 | ||||
-rw-r--r-- | app/helpers/ci/pipeline_editor_helper.rb | 1 | ||||
-rw-r--r-- | app/helpers/ci/runners_helper.rb | 11 |
3 files changed, 8 insertions, 12 deletions
diff --git a/app/helpers/ci/jobs_helper.rb b/app/helpers/ci/jobs_helper.rb index c7f40decae8..c0dca66bac8 100644 --- a/app/helpers/ci/jobs_helper.rb +++ b/app/helpers/ci/jobs_helper.rb @@ -19,10 +19,12 @@ module Ci } end - def bridge_data(build) + def bridge_data(build, project) { - "build_name" => build.name, - "empty-state-illustration-path" => image_path('illustrations/job-trigger-md.svg') + "build_id" => build.id, + "empty-state-illustration-path" => image_path('illustrations/job-trigger-md.svg'), + "pipeline_iid" => build.pipeline.iid, + "project_full_path" => project.full_path } end diff --git a/app/helpers/ci/pipeline_editor_helper.rb b/app/helpers/ci/pipeline_editor_helper.rb index 9bbc326a750..bb7226da74e 100644 --- a/app/helpers/ci/pipeline_editor_helper.rb +++ b/app/helpers/ci/pipeline_editor_helper.rb @@ -20,6 +20,7 @@ module Ci "empty-state-illustration-path" => image_path('illustrations/empty-state/empty-dag-md.svg'), "initial-branch-name" => initial_branch, "lint-help-page-path" => help_page_path('ci/lint', anchor: 'validate-basic-logic-and-syntax'), + "lint-unavailable-help-page-path" => help_page_path('ci/pipeline_editor/index', anchor: 'configuration-validation-currently-not-available'), "needs-help-page-path" => help_page_path('ci/yaml/index', anchor: 'needs'), "new-merge-request-path" => namespace_project_new_merge_request_path, "pipeline_etag" => latest_commit ? graphql_etag_pipeline_sha_path(commit_sha) : '', diff --git a/app/helpers/ci/runners_helper.rb b/app/helpers/ci/runners_helper.rb index 8f219656b71..f84b42209da 100644 --- a/app/helpers/ci/runners_helper.rb +++ b/app/helpers/ci/runners_helper.rb @@ -24,7 +24,7 @@ module Ci span_class = 'gl-text-gray-600' end when :not_connected, :never_contacted - title = s_("Runners|New runner, has not connected yet") + title = s_("Runners|New runner, has not contacted yet") icon = 'warning-solid' when :offline title = s_("Runners|Runner is offline, last contact was %{runner_contact} ago") % { runner_contact: time_ago_in_words(runner.contacted_at) } @@ -65,14 +65,7 @@ module Ci # Runner install help page is external, located at # https://gitlab.com/gitlab-org/gitlab-runner runner_install_help_page: 'https://docs.gitlab.com/runner/install/', - registration_token: Gitlab::CurrentSettings.runners_registration_token, - - # All runner counts are returned as formatted strings - active_runners_count: Ci::Runner.online.count.to_s, - all_runners_count: limited_counter_with_delimiter(Ci::Runner), - instance_runners_count: limited_counter_with_delimiter(Ci::Runner.instance_type), - group_runners_count: limited_counter_with_delimiter(Ci::Runner.group_type), - project_runners_count: limited_counter_with_delimiter(Ci::Runner.project_type) + registration_token: Gitlab::CurrentSettings.runners_registration_token } end |