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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
35e260b9
Commit
35e260b9
authored
Apr 14, 2017
by
winniehell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move labels of search results from bottom to title (!10705)
parent
344a2619
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
app/views/search/results/_issue.html.haml
app/views/search/results/_issue.html.haml
+2
-3
app/views/search/results/_merge_request.html.haml
app/views/search/results/_merge_request.html.haml
+4
-5
changelogs/unreleased/move-search-labels.yml
changelogs/unreleased/move-search-labels.yml
+4
-0
No files found.
app/views/search/results/_issue.html.haml
View file @
35e260b9
...
...
@@ -3,6 +3,8 @@
=
confidential_icon
(
issue
)
=
link_to
[
issue
.
project
.
namespace
.
becomes
(
Namespace
),
issue
.
project
,
issue
]
do
%span
.term.str-truncated
=
issue
.
title
-
if
issue
.
closed?
%span
.label.label-danger.prepend-left-5
Closed
.pull-right
##{issue.iid}
-
if
issue
.
description
.
present?
.description.term
...
...
@@ -10,6 +12,3 @@
=
search_md_sanitize
(
issue
,
:description
)
%span
.light
#{
issue
.
project
.
name_with_namespace
}
-
if
issue
.
closed?
.pull-right
%span
.label.label-danger
Closed
app/views/search/results/_merge_request.html.haml
View file @
35e260b9
...
...
@@ -2,6 +2,10 @@
%h4
=
link_to
[
merge_request
.
target_project
.
namespace
.
becomes
(
Namespace
),
merge_request
.
target_project
,
merge_request
]
do
%span
.term.str-truncated
=
merge_request
.
title
-
if
merge_request
.
merged?
%span
.label.label-primary.prepend-left-5
Merged
-
elsif
merge_request
.
closed?
%span
.label.label-danger.prepend-left-5
Closed
.pull-right
=
merge_request
.
to_reference
-
if
merge_request
.
description
.
present?
.description.term
...
...
@@ -9,8 +13,3 @@
=
search_md_sanitize
(
merge_request
,
:description
)
%span
.light
#{
merge_request
.
project
.
name_with_namespace
}
.pull-right
-
if
merge_request
.
merged?
%span
.label.label-primary
Merged
-
elsif
merge_request
.
closed?
%span
.label.label-danger
Closed
changelogs/unreleased/move-search-labels.yml
0 → 100644
View file @
35e260b9
---
title
:
Move labels of search results from bottom to title
merge_request
:
10705
author
:
dr
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