Commit 419dfed5 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '13655-add-space-between-CI-warning-messages' into 'master'

Add a space between CI warning messages

Closes #13655

See merge request gitlab-org/gitlab-ee!15563
parents d80a9aea 561fd235
......@@ -2,17 +2,17 @@
module EE
module RunnersHelper
def ci_usage_warning_message(namespace, project)
message = ci_usage_base_message(namespace)
message = [ci_usage_base_message(namespace)]
return unless message
if ::Gitlab.com? && can?(current_user, :admin_project, project)
message += " #{purchase_shared_runner_minutes_link}"
message << purchase_shared_runner_minutes_link
elsif namespace.shared_runners_minutes_used?
message += " #{s_('Pipelines|Pipelines will not run anymore on shared Runners.')}"
message << s_('Pipelines|Pipelines will not run anymore on shared Runners.')
end
message.html_safe
message.join(' ').html_safe
end
private
......
---
title: Add space between CI usage warning messages
merge_request: 15563
author: briankabiro
type: fixed
......@@ -10993,6 +10993,9 @@ msgstr ""
msgid "Pipelines|Loading Pipelines"
msgstr ""
msgid "Pipelines|Pipelines will not run anymore on shared Runners."
msgstr ""
msgid "Pipelines|Project cache successfully reset."
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment