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
f92f188c
Commit
f92f188c
authored
Mar 09, 2021
by
Marcin Sedlak-Jakubowski
Committed by
Ash McKenzie
Mar 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use "Created" instead of "opened" when describing issue creation
parent
48878e18
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
16 deletions
+21
-16
app/assets/javascripts/issues_list/components/issuable.vue
app/assets/javascripts/issues_list/components/issuable.vue
+3
-3
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+1
-1
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+1
-1
changelogs/unreleased/246959-msj-opened-created-ui.yml
changelogs/unreleased/246959-msj-opened-created-ui.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+9
-9
spec/frontend/issues_list/components/issuable_spec.js
spec/frontend/issues_list/components/issuable_spec.js
+2
-2
No files found.
app/assets/javascripts/issues_list/components/issuable.vue
View file @
f92f188c
...
...
@@ -32,9 +32,9 @@ import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue';
export
default
{
i18n
:
{
openedAgo
:
__
(
'
open
ed %{timeAgoString} by %{user}
'
),
openedAgoJira
:
__
(
'
open
ed %{timeAgoString} by %{user} in Jira
'
),
openedAgoServiceDesk
:
__
(
'
open
ed %{timeAgoString} by %{email} via %{user}
'
),
openedAgo
:
__
(
'
creat
ed %{timeAgoString} by %{user}
'
),
openedAgoJira
:
__
(
'
creat
ed %{timeAgoString} by %{user} in Jira
'
),
openedAgoServiceDesk
:
__
(
'
creat
ed %{timeAgoString} by %{email} via %{user}
'
),
},
components
:
{
IssueAssignees
,
...
...
app/helpers/issuables_helper.rb
View file @
f92f188c
...
...
@@ -151,7 +151,7 @@ module IssuablesHelper
def
issuable_meta
(
issuable
,
project
)
output
=
[]
output
<<
"
Open
ed
#{
time_ago_with_tooltip
(
issuable
.
created_at
)
}
by "
.
html_safe
output
<<
"
Creat
ed
#{
time_ago_with_tooltip
(
issuable
.
created_at
)
}
by "
.
html_safe
if
issuable
.
is_a?
(
Issue
)
&&
issuable
.
service_desk_reply_to
output
<<
"
#{
html_escape
(
issuable
.
service_desk_reply_to
)
}
via "
...
...
app/views/projects/issues/_issue.html.haml
View file @
f92f188c
...
...
@@ -22,7 +22,7 @@
#{
issuable_reference
(
issue
)
}
%span
.issuable-authored.d-none.d-sm-inline-block
·
open
ed
#{
time_ago_with_tooltip
(
issue
.
created_at
,
placement:
'bottom'
)
}
by
creat
ed
#{
time_ago_with_tooltip
(
issue
.
created_at
,
placement:
'bottom'
)
}
by
-
if
issue
.
service_desk_reply_to
#{
issue
.
service_desk_reply_to
}
via
#{
link_to_member
(
@project
,
issue
.
author
,
avatar:
false
)
}
...
...
changelogs/unreleased/246959-msj-opened-created-ui.yml
0 → 100644
View file @
f92f188c
---
title
:
Use Created instead of opened when describing issue creation
merge_request
:
49478
author
:
type
:
other
locale/gitlab.pot
View file @
f92f188c
...
...
@@ -35243,6 +35243,15 @@ msgstr ""
msgid "created"
msgstr ""
msgid "created %{timeAgoString} by %{email} via %{user}"
msgstr ""
msgid "created %{timeAgoString} by %{user}"
msgstr ""
msgid "created %{timeAgoString} by %{user} in Jira"
msgstr ""
msgid "created %{timeAgo}"
msgstr ""
...
...
@@ -36016,15 +36025,6 @@ msgstr ""
msgid "open issue"
msgstr ""
msgid "opened %{timeAgoString} by %{email} via %{user}"
msgstr ""
msgid "opened %{timeAgoString} by %{user}"
msgstr ""
msgid "opened %{timeAgoString} by %{user} in Jira"
msgstr ""
msgid "opened %{timeAgo}"
msgstr ""
...
...
spec/frontend/issues_list/components/issuable_spec.js
View file @
f92f188c
...
...
@@ -192,9 +192,9 @@ describe('Issuable component', () => {
expect
(
wrapper
.
classes
(
'
closed
'
)).
toBe
(
false
);
});
it
(
'
renders fuzzy
open
ed date and author
'
,
()
=>
{
it
(
'
renders fuzzy
creat
ed date and author
'
,
()
=>
{
expect
(
trimText
(
findOpenedAgoContainer
().
text
())).
toContain
(
`
open
ed 1 month ago by
${
TEST_USER_NAME
}
`
,
`
creat
ed 1 month ago by
${
TEST_USER_NAME
}
`
,
);
});
...
...
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