diff options
Diffstat (limited to 'app/helpers/ci')
-rw-r--r-- | app/helpers/ci/pipelines_helper.rb | 2 | ||||
-rw-r--r-- | app/helpers/ci/runners_helper.rb | 1 | ||||
-rw-r--r-- | app/helpers/ci/variables_helper.rb | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/app/helpers/ci/pipelines_helper.rb b/app/helpers/ci/pipelines_helper.rb index c93c8dd8d76..823332c3d1d 100644 --- a/app/helpers/ci/pipelines_helper.rb +++ b/app/helpers/ci/pipelines_helper.rb @@ -101,7 +101,7 @@ module Ci has_gitlab_ci: has_gitlab_ci?(project).to_s, pipeline_editor_path: can?(current_user, :create_pipeline, project) && project_ci_pipeline_editor_path(project), suggested_ci_templates: suggested_ci_templates.to_json, - ci_runner_settings_path: project_settings_ci_cd_path(project, ci_runner_templates: true, anchor: 'js-runners-settings') + ci_runner_settings_path: project_settings_ci_cd_path(project, anchor: 'js-runners-settings') } experiment(:runners_availability_section, namespace: project.root_ancestor) do |e| diff --git a/app/helpers/ci/runners_helper.rb b/app/helpers/ci/runners_helper.rb index ac36c867baf..41ef0bd20a8 100644 --- a/app/helpers/ci/runners_helper.rb +++ b/app/helpers/ci/runners_helper.rb @@ -63,6 +63,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/', + new_runner_path: new_admin_runner_path, registration_token: Gitlab::CurrentSettings.runners_registration_token, online_contact_timeout_secs: ::Ci::Runner::ONLINE_CONTACT_TIMEOUT.to_i, stale_timeout_secs: ::Ci::Runner::STALE_TIMEOUT.to_i, diff --git a/app/helpers/ci/variables_helper.rb b/app/helpers/ci/variables_helper.rb index 84572363a8d..a492c48e58c 100644 --- a/app/helpers/ci/variables_helper.rb +++ b/app/helpers/ci/variables_helper.rb @@ -47,6 +47,10 @@ module Ci ] end + def ci_variable_maskable_raw_regex + Ci::Maskable::MASK_AND_RAW_REGEX.inspect.sub('\\A', '^').sub('\\z', '$')[1...-1] + end + def ci_variable_maskable_regex Ci::Maskable::REGEX.inspect.sub('\\A', '^').sub('\\z', '$').sub(%r{^/}, '').sub(%r{/[a-z]*$}, '').gsub('\/', '/') end |