diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index 1d1d85246b53488a07615b032b04645a510b59d7..432070ed28a15fb3feabf0ca1f90c55c4153157d 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -4,6 +4,9 @@ .event-item.gl-border-bottom-0.gl-pb-3{ class: current_path?('users#activity') ? 'user-profile-activity gl-pl-7!' : 'project-activity-item' } .event-item-timestamp.gl-font-sm #{time_ago_with_tooltip(event.created_at)} + - if event.imported? + %span • + = render "import/shared/imported_text", importable: _('event') - if event.wiki_page? = render "events/event/wiki", event: event diff --git a/app/views/import/shared/_imported_text.html.haml b/app/views/import/shared/_imported_text.html.haml new file mode 100644 index 0000000000000000000000000000000000000000..cac62c6fb49543aee23367be5a7a1e0084b7dae0 --- /dev/null +++ b/app/views/import/shared/_imported_text.html.haml @@ -0,0 +1,3 @@ +- tooltip_title = safe_format(s_('BulkImport|This %{importable} was imported from another instance.'), importable: local_assigns[:importable]) + +%span.has-tooltip.gl-line-height-normal.gl-font-sm{ title: tooltip_title }= _('Imported') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index e98229796ab2b06e31fd8ae93ab5c76af9e57ec5..1ffa243696ea3d16791120ea97816f9f6853d1b6 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -60788,6 +60788,9 @@ msgstr "" msgid "estimateCommand|%{slash_command} overwrites the total estimated time." msgstr "" +msgid "event" +msgstr "" + msgid "example.com" msgstr ""