Commit 1e453c91 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents c172f106 420d546b
......@@ -89,4 +89,6 @@
%span.icon-wrapper.pipeline-status
= render 'ci/status/icon', status: project.commit.last_pipeline.detailed_status(current_user), type: 'commit', tooltip_placement: 'top', path: pipeline_path
.updated-note
%span #{_('Updated')} #{updated_tooltip}
%span
= _('Updated')
= updated_tooltip
---
title: Fix incorrect use of message interpolation
merge_request: 31121
author:
type: fixed
......@@ -53,6 +53,19 @@ describe 'Users > User browses projects on user page', :js do
expect(page).to have_content(project2.name)
end
it 'does not have incorrectly interpolated message', :js do
project = create(:project, namespace: user.namespace, updated_at: 2.minutes.since)
sign_in(user)
visit user_path(user)
click_nav_link('Personal projects')
wait_for_requests
expect(page).to have_content(project.name)
expect(page).not_to have_content("_('Updated')")
end
context 'when not signed in' do
it 'renders user public project' do
visit user_path(user)
......
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