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
635286d9
Commit
635286d9
authored
Feb 02, 2021
by
Marcin Sedlak-Jakubowski
Committed by
Jacques Erasmus
Feb 02, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turn "To-Do" to "to do" in alert sidebar and error
parent
d950faef
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
8 deletions
+10
-8
app/assets/javascripts/alert_management/components/sidebar/sidebar_header.vue
...ts/alert_management/components/sidebar/sidebar_header.vue
+1
-1
app/assets/javascripts/alert_management/components/sidebar/sidebar_todo.vue
...ipts/alert_management/components/sidebar/sidebar_todo.vue
+1
-1
changelogs/unreleased/msj-todo-alerts.yml
changelogs/unreleased/msj-todo-alerts.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-6
No files found.
app/assets/javascripts/alert_management/components/sidebar/sidebar_header.vue
View file @
635286d9
...
@@ -27,7 +27,7 @@ export default {
...
@@ -27,7 +27,7 @@ export default {
<
template
>
<
template
>
<div
class=
"block gl-display-flex gl-justify-content-space-between"
>
<div
class=
"block gl-display-flex gl-justify-content-space-between"
>
<span
class=
"issuable-header-text hide-collapsed"
>
<span
class=
"issuable-header-text hide-collapsed"
>
{{
__
(
'
To
-
Do
'
)
}}
{{
__
(
'
To
Do
'
)
}}
</span>
</span>
<sidebar-todo
<sidebar-todo
v-if=
"!sidebarCollapsed"
v-if=
"!sidebarCollapsed"
...
...
app/assets/javascripts/alert_management/components/sidebar/sidebar_todo.vue
View file @
635286d9
...
@@ -9,7 +9,7 @@ import alertQuery from '../../graphql/queries/details.query.graphql';
...
@@ -9,7 +9,7 @@ import alertQuery from '../../graphql/queries/details.query.graphql';
export
default
{
export
default
{
i18n
:
{
i18n
:
{
UPDATE_ALERT_TODO_ERROR
:
s__
(
UPDATE_ALERT_TODO_ERROR
:
s__
(
'
AlertManagement|There was an error while updating the
To-Do
of the alert.
'
,
'
AlertManagement|There was an error while updating the
to-do item
of the alert.
'
,
),
),
},
},
components
:
{
components
:
{
...
...
changelogs/unreleased/msj-todo-alerts.yml
0 → 100644
View file @
635286d9
---
title
:
Fix formatting of "to do" in alert sidebar and error
merge_request
:
53037
author
:
type
:
fixed
locale/gitlab.pot
View file @
635286d9
...
@@ -2576,9 +2576,6 @@ msgstr ""
...
@@ -2576,9 +2576,6 @@ msgstr ""
msgid "AlertManagement|There was an error displaying the alerts. Confirm your endpoint's configuration details to ensure alerts appear."
msgid "AlertManagement|There was an error displaying the alerts. Confirm your endpoint's configuration details to ensure alerts appear."
msgstr ""
msgstr ""
msgid "AlertManagement|There was an error while updating the To-Do of the alert."
msgstr ""
msgid "AlertManagement|There was an error while updating the assignee(s) list. Please try again."
msgid "AlertManagement|There was an error while updating the assignee(s) list. Please try again."
msgstr ""
msgstr ""
...
@@ -2588,6 +2585,9 @@ msgstr ""
...
@@ -2588,6 +2585,9 @@ msgstr ""
msgid "AlertManagement|There was an error while updating the status of the alert."
msgid "AlertManagement|There was an error while updating the status of the alert."
msgstr ""
msgstr ""
msgid "AlertManagement|There was an error while updating the to-do item of the alert."
msgstr ""
msgid "AlertManagement|This assignee cannot be assigned to this alert."
msgid "AlertManagement|This assignee cannot be assigned to this alert."
msgstr ""
msgstr ""
...
@@ -30385,9 +30385,6 @@ msgstr ""
...
@@ -30385,9 +30385,6 @@ msgstr ""
msgid "To widen your search, change or remove filters."
msgid "To widen your search, change or remove filters."
msgstr ""
msgstr ""
msgid "To-Do"
msgstr ""
msgid "To-Do List"
msgid "To-Do List"
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