Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
561fd235
Commit
561fd235
authored
Sep 11, 2019
by
Brian Kabiro
Committed by
Rémy Coutable
Sep 11, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a space between CI warning messages
Finishes #13655
parent
d80a9aea
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
ee/app/helpers/ee/runners_helper.rb
ee/app/helpers/ee/runners_helper.rb
+4
-4
ee/changelogs/unreleased/13655-add-space-between-CI-warning-messages.yml
...nreleased/13655-add-space-between-CI-warning-messages.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
ee/app/helpers/ee/runners_helper.rb
View file @
561fd235
...
@@ -2,17 +2,17 @@
...
@@ -2,17 +2,17 @@
module
EE
module
EE
module
RunnersHelper
module
RunnersHelper
def
ci_usage_warning_message
(
namespace
,
project
)
def
ci_usage_warning_message
(
namespace
,
project
)
message
=
ci_usage_base_message
(
namespace
)
message
=
[
ci_usage_base_message
(
namespace
)]
return
unless
message
return
unless
message
if
::
Gitlab
.
com?
&&
can?
(
current_user
,
:admin_project
,
project
)
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?
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
end
message
.
html_safe
message
.
join
(
' '
).
html_safe
end
end
private
private
...
...
ee/changelogs/unreleased/13655-add-space-between-CI-warning-messages.yml
0 → 100644
View file @
561fd235
---
title
:
Add space between CI usage warning messages
merge_request
:
15563
author
:
briankabiro
type
:
fixed
locale/gitlab.pot
View file @
561fd235
...
@@ -10993,6 +10993,9 @@ msgstr ""
...
@@ -10993,6 +10993,9 @@ msgstr ""
msgid "Pipelines|Loading Pipelines"
msgid "Pipelines|Loading Pipelines"
msgstr ""
msgstr ""
msgid "Pipelines|Pipelines will not run anymore on shared Runners."
msgstr ""
msgid "Pipelines|Project cache successfully reset."
msgid "Pipelines|Project cache successfully reset."
msgstr ""
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment