Commit db33a339 authored by Ash McKenzie's avatar Ash McKenzie

Merge branch '246959-msj-opened-created-ui' into 'master'

Use "Created" instead of "opened" when describing issue creation

See merge request gitlab-org/gitlab!49478
parents 42bf1f22 f92f188c
...@@ -32,9 +32,9 @@ import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue'; ...@@ -32,9 +32,9 @@ import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue';
export default { export default {
i18n: { i18n: {
openedAgo: __('opened %{timeAgoString} by %{user}'), openedAgo: __('created %{timeAgoString} by %{user}'),
openedAgoJira: __('opened %{timeAgoString} by %{user} in Jira'), openedAgoJira: __('created %{timeAgoString} by %{user} in Jira'),
openedAgoServiceDesk: __('opened %{timeAgoString} by %{email} via %{user}'), openedAgoServiceDesk: __('created %{timeAgoString} by %{email} via %{user}'),
}, },
components: { components: {
IssueAssignees, IssueAssignees,
......
...@@ -151,7 +151,7 @@ module IssuablesHelper ...@@ -151,7 +151,7 @@ module IssuablesHelper
def issuable_meta(issuable, project) def issuable_meta(issuable, project)
output = [] output = []
output << "Opened #{time_ago_with_tooltip(issuable.created_at)} by ".html_safe output << "Created #{time_ago_with_tooltip(issuable.created_at)} by ".html_safe
if issuable.is_a?(Issue) && issuable.service_desk_reply_to if issuable.is_a?(Issue) && issuable.service_desk_reply_to
output << "#{html_escape(issuable.service_desk_reply_to)} via " output << "#{html_escape(issuable.service_desk_reply_to)} via "
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#{issuable_reference(issue)} #{issuable_reference(issue)}
%span.issuable-authored.d-none.d-sm-inline-block %span.issuable-authored.d-none.d-sm-inline-block
&middot; &middot;
opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')} by created #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')} by
- if issue.service_desk_reply_to - if issue.service_desk_reply_to
#{issue.service_desk_reply_to} via #{issue.service_desk_reply_to} via
#{link_to_member(@project, issue.author, avatar: false)} #{link_to_member(@project, issue.author, avatar: false)}
......
---
title: Use Created instead of opened when describing issue creation
merge_request: 49478
author:
type: other
...@@ -35309,6 +35309,15 @@ msgstr "" ...@@ -35309,6 +35309,15 @@ msgstr ""
msgid "created" msgid "created"
msgstr "" 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}" msgid "created %{timeAgo}"
msgstr "" msgstr ""
...@@ -36082,15 +36091,6 @@ msgstr "" ...@@ -36082,15 +36091,6 @@ msgstr ""
msgid "open issue" msgid "open issue"
msgstr "" 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}" msgid "opened %{timeAgo}"
msgstr "" msgstr ""
......
...@@ -192,9 +192,9 @@ describe('Issuable component', () => { ...@@ -192,9 +192,9 @@ describe('Issuable component', () => {
expect(wrapper.classes('closed')).toBe(false); expect(wrapper.classes('closed')).toBe(false);
}); });
it('renders fuzzy opened date and author', () => { it('renders fuzzy created date and author', () => {
expect(trimText(findOpenedAgoContainer().text())).toContain( expect(trimText(findOpenedAgoContainer().text())).toContain(
`opened 1 month ago by ${TEST_USER_NAME}`, `created 1 month ago by ${TEST_USER_NAME}`,
); );
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment