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
9aa75af3
Commit
9aa75af3
authored
Jul 24, 2019
by
Alex Kalderimis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incorrect use of message interpolation
Fixes
https://gitlab.com/gitlab-org/gitlab-ce/issues/65088
parent
7fa0c766
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
1 deletion
+21
-1
app/views/shared/projects/_project.html.haml
app/views/shared/projects/_project.html.haml
+3
-1
changelogs/unreleased/65088-incorrect-message-interpolation-on-project-listing.yml
...88-incorrect-message-interpolation-on-project-listing.yml
+5
-0
spec/features/users/user_browses_projects_on_user_page_spec.rb
...features/users/user_browses_projects_on_user_page_spec.rb
+13
-0
No files found.
app/views/shared/projects/_project.html.haml
View file @
9aa75af3
...
...
@@ -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
changelogs/unreleased/65088-incorrect-message-interpolation-on-project-listing.yml
0 → 100644
View file @
9aa75af3
---
title
:
Fix incorrect use of message interpolation
merge_request
:
31121
author
:
type
:
fixed
spec/features/users/user_browses_projects_on_user_page_spec.rb
View file @
9aa75af3
...
...
@@ -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
)
...
...
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