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
Léo-Paul Géneau
gitlab-ce
Commits
5a7f15fb
Commit
5a7f15fb
authored
Aug 15, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show label closed on search result
parent
be0c6c27
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
app/views/search/_result.html.haml
app/views/search/_result.html.haml
+6
-0
app/views/search/show.html.haml
app/views/search/show.html.haml
+1
-1
No files found.
app/views/search/_result.html.haml
View file @
5a7f15fb
...
@@ -30,6 +30,9 @@
...
@@ -30,6 +30,9 @@
%span
.light
(
#{
merge_request
.
source_project
.
name_with_namespace
}
:
#{
merge_request
.
source_branch
}
→
#{
merge_request
.
target_project
.
name_with_namespace
}
:
#{
merge_request
.
target_branch
}
)
%span
.light
(
#{
merge_request
.
source_project
.
name_with_namespace
}
:
#{
merge_request
.
source_branch
}
→
#{
merge_request
.
target_project
.
name_with_namespace
}
:
#{
merge_request
.
target_branch
}
)
-
else
-
else
%span
.light
(
#{
merge_request
.
source_branch
}
→
#{
merge_request
.
target_branch
}
)
%span
.light
(
#{
merge_request
.
source_branch
}
→
#{
merge_request
.
target_branch
}
)
-
if
merge_request
.
closed?
%span
.label
Closed
-
@issues
.
each
do
|
issue
|
-
@issues
.
each
do
|
issue
|
%li
%li
issue:
issue:
...
@@ -38,6 +41,9 @@
...
@@ -38,6 +41,9 @@
%strong
.term
%strong
.term
=
truncate
issue
.
title
,
length:
50
=
truncate
issue
.
title
,
length:
50
%span
.light
(
#{
issue
.
project
.
name_with_namespace
}
)
%span
.light
(
#{
issue
.
project
.
name_with_namespace
}
)
-
if
issue
.
closed?
%span
.label
Closed
-
@wiki_pages
.
each
do
|
wiki_page
|
-
@wiki_pages
.
each
do
|
wiki_page
|
%li
%li
wiki:
wiki:
...
...
app/views/search/show.html.haml
View file @
5a7f15fb
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
=
hidden_field_tag
:project_id
,
params
[
:project_id
]
=
hidden_field_tag
:project_id
,
params
[
:project_id
]
=
hidden_field_tag
:group_id
,
params
[
:group_id
]
=
hidden_field_tag
:group_id
,
params
[
:group_id
]
=
hidden_field_tag
:search_code
,
params
[
:search_code
]
=
hidden_field_tag
:search_code
,
params
[
:search_code
]
=
submit_tag
'Search'
,
class:
"btn btn-
primary wid
e"
=
submit_tag
'Search'
,
class:
"btn btn-
creat
e"
.prepend-top-10
.prepend-top-10
=
render
'filter'
,
f:
f
=
render
'filter'
,
f:
f
...
...
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