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
4fd43228
Commit
4fd43228
authored
Sep 08, 2021
by
scootergrisen
Committed by
Rémy Coutable
Sep 08, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix strings with double "PrometheusService|PrometheusService|"
parent
f9651eae
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/models/integrations/prometheus.rb
app/models/integrations/prometheus.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+2
-2
spec/models/integrations/prometheus_spec.rb
spec/models/integrations/prometheus_spec.rb
+1
-1
No files found.
app/models/integrations/prometheus.rb
View file @
4fd43228
...
...
@@ -76,7 +76,7 @@ module Integrations
name:
'google_iap_audience_client_id'
,
title:
'Google IAP Audience Client ID'
,
placeholder:
s_
(
'PrometheusService|IAP_CLIENT_ID.apps.googleusercontent.com'
),
help:
s_
(
'PrometheusService|
PrometheusService|
The ID of the IAP-secured resource.'
),
help:
s_
(
'PrometheusService|The ID of the IAP-secured resource.'
),
autocomplete:
'off'
,
required:
false
},
...
...
locale/gitlab.pot
View file @
4fd43228
...
...
@@ -26873,10 +26873,10 @@ msgstr ""
msgid "PrometheusService|Prometheus cluster integration"
msgstr ""
msgid "PrometheusService|
PrometheusService|The ID of the IAP-secured resource
."
msgid "PrometheusService|
Select this checkbox to override the auto configuration settings with your own settings
."
msgstr ""
msgid "PrometheusService|
Select this checkbox to override the auto configuration settings with your own settings
."
msgid "PrometheusService|
The ID of the IAP-secured resource
."
msgstr ""
msgid "PrometheusService|The Prometheus API base URL."
...
...
spec/models/integrations/prometheus_spec.rb
View file @
4fd43228
...
...
@@ -516,7 +516,7 @@ RSpec.describe Integrations::Prometheus, :use_clean_rails_memory_store_caching,
name:
'google_iap_audience_client_id'
,
title:
'Google IAP Audience Client ID'
,
placeholder:
s_
(
'PrometheusService|IAP_CLIENT_ID.apps.googleusercontent.com'
),
help:
s_
(
'PrometheusService|
PrometheusService|
The ID of the IAP-secured resource.'
),
help:
s_
(
'PrometheusService|The ID of the IAP-secured resource.'
),
autocomplete:
'off'
,
required:
false
},
...
...
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