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
9b53da87
Commit
9b53da87
authored
Jul 22, 2020
by
Justin Mandell
Committed by
Michael Kozono
Jul 22, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed Ops-Settings page titles capitalization
Corrected the title cased titles to be sentenced cased
parent
c8d4dfba
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
18 additions
and
10 deletions
+18
-10
app/assets/javascripts/grafana_integration/components/grafana_integration.vue
...ts/grafana_integration/components/grafana_integration.vue
+1
-1
app/assets/javascripts/operation_settings/components/metrics_settings.vue
...cripts/operation_settings/components/metrics_settings.vue
+1
-1
app/views/projects/settings/operations/_error_tracking.html.haml
...ws/projects/settings/operations/_error_tracking.html.haml
+1
-1
changelogs/unreleased/196073-sentence-case-settings-ops.yml
changelogs/unreleased/196073-sentence-case-settings-ops.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+6
-3
spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap
...components/__snapshots__/grafana_integration_spec.js.snap
+1
-1
spec/frontend/grafana_integration/components/grafana_integration_spec.js
...rafana_integration/components/grafana_integration_spec.js
+1
-1
spec/frontend/operation_settings/components/metrics_settings_spec.js
...nd/operation_settings/components/metrics_settings_spec.js
+1
-1
spec/views/projects/settings/operations/show.html.haml_spec.rb
...views/projects/settings/operations/show.html.haml_spec.rb
+1
-1
No files found.
app/assets/javascripts/grafana_integration/components/grafana_integration.vue
View file @
9b53da87
...
...
@@ -56,7 +56,7 @@ export default {
<section
id=
"grafana"
class=
"settings no-animate js-grafana-integration"
>
<div
class=
"settings-header"
>
<h3
class=
"js-section-header h4"
>
{{
s__
(
'
GrafanaIntegration|Grafana
A
uthentication
'
)
}}
{{
s__
(
'
GrafanaIntegration|Grafana
a
uthentication
'
)
}}
</h3>
<gl-deprecated-button
class=
"js-settings-toggle"
>
{{
__
(
'
Expand
'
)
}}
</gl-deprecated-button>
<p
class=
"js-section-sub-header"
>
...
...
app/assets/javascripts/operation_settings/components/metrics_settings.vue
View file @
9b53da87
...
...
@@ -32,7 +32,7 @@ export default {
<section
class=
"settings no-animate"
>
<div
class=
"settings-header"
>
<h3
class=
"js-section-header h4"
>
{{
s__
(
'
MetricsSettings|Metrics
D
ashboard
'
)
}}
{{
s__
(
'
MetricsSettings|Metrics
d
ashboard
'
)
}}
</h3>
<gl-deprecated-button
class=
"js-settings-toggle"
>
{{
__
(
'
Expand
'
)
}}
</gl-deprecated-button>
<p
class=
"js-section-sub-header"
>
...
...
app/views/projects/settings/operations/_error_tracking.html.haml
View file @
9b53da87
...
...
@@ -5,7 +5,7 @@
%section
.settings.no-animate.js-error-tracking-settings
.settings-header
%h3
{
:class
=>
"h4"
}
=
_
(
'Error
T
racking'
)
=
_
(
'Error
t
racking'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
=
_
(
'Expand'
)
%p
...
...
changelogs/unreleased/196073-sentence-case-settings-ops.yml
0 → 100644
View file @
9b53da87
---
title
:
"
Fixed
ops
settings
titles"
merge_request
:
37259
author
:
type
:
fixed
locale/gitlab.pot
View file @
9b53da87
...
...
@@ -9538,6 +9538,9 @@ msgstr ""
msgid "Error setting up editor. Please try again."
msgstr ""
msgid "Error tracking"
msgstr ""
msgid "Error updating %{issuableType}"
msgstr ""
...
...
@@ -11533,10 +11536,10 @@ msgstr ""
msgid "GrafanaIntegration|Enter the base URL of the Grafana instance."
msgstr ""
msgid "GrafanaIntegration|Grafana
Authentication
"
msgid "GrafanaIntegration|Grafana
URL
"
msgstr ""
msgid "GrafanaIntegration|Grafana
URL
"
msgid "GrafanaIntegration|Grafana
authentication
"
msgstr ""
msgid "Grant access"
...
...
@@ -14873,7 +14876,7 @@ msgstr ""
msgid "MetricsSettings|Manage Metrics Dashboard settings."
msgstr ""
msgid "MetricsSettings|Metrics
D
ashboard"
msgid "MetricsSettings|Metrics
d
ashboard"
msgstr ""
msgid "MetricsSettings|UTC (Coordinated Universal Time)"
...
...
spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap
View file @
9b53da87
...
...
@@ -12,7 +12,7 @@ exports[`grafana integration component default state to match the default snapsh
class="js-section-header h4"
>
Grafana
A
uthentication
Grafana
a
uthentication
</h3>
...
...
spec/frontend/grafana_integration/components/grafana_integration_spec.js
View file @
9b53da87
...
...
@@ -44,7 +44,7 @@ describe('grafana integration component', () => {
it
(
'
renders header text
'
,
()
=>
{
wrapper
=
shallowMount
(
GrafanaIntegration
,
{
store
});
expect
(
wrapper
.
find
(
'
.js-section-header
'
).
text
()).
toBe
(
'
Grafana
A
uthentication
'
);
expect
(
wrapper
.
find
(
'
.js-section-header
'
).
text
()).
toBe
(
'
Grafana
a
uthentication
'
);
});
describe
(
'
expand/collapse button
'
,
()
=>
{
...
...
spec/frontend/operation_settings/components/metrics_settings_spec.js
View file @
9b53da87
...
...
@@ -56,7 +56,7 @@ describe('operation settings external dashboard component', () => {
it
(
'
renders header text
'
,
()
=>
{
mountComponent
();
expect
(
wrapper
.
find
(
'
.js-section-header
'
).
text
()).
toBe
(
'
Metrics
D
ashboard
'
);
expect
(
wrapper
.
find
(
'
.js-section-header
'
).
text
()).
toBe
(
'
Metrics
d
ashboard
'
);
});
describe
(
'
expand/collapse button
'
,
()
=>
{
...
...
spec/views/projects/settings/operations/show.html.haml_spec.rb
View file @
9b53da87
...
...
@@ -35,7 +35,7 @@ RSpec.describe 'projects/settings/operations/show' do
it
'renders the Operations Settings page'
do
render
template:
'projects/settings/operations/show'
,
locals:
operations_show_locals
expect
(
rendered
).
to
have_content
_
(
'Error
T
racking'
)
expect
(
rendered
).
to
have_content
_
(
'Error
t
racking'
)
expect
(
rendered
).
to
have_content
_
(
'To link Sentry to GitLab, enter your Sentry URL and Auth Token'
)
end
end
...
...
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