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
Jérome Perrin
gitlab-ce
Commits
9ab12e09
Commit
9ab12e09
authored
Jul 12, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix search blobs for wiki
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
f6609c98
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
app/models/repository.rb
app/models/repository.rb
+1
-1
app/views/search/results/_blob.html.haml
app/views/search/results/_blob.html.haml
+1
-1
app/views/search/results/_wiki_blob.html.haml
app/views/search/results/_wiki_blob.html.haml
+1
-0
No files found.
app/models/repository.rb
View file @
9ab12e09
...
@@ -437,7 +437,7 @@ class Repository
...
@@ -437,7 +437,7 @@ class Repository
Gitlab
::
Popen
.
popen
(
args
,
path_to_repo
).
first
.
scrub
.
split
(
/^--$/
)
Gitlab
::
Popen
.
popen
(
args
,
path_to_repo
).
first
.
scrub
.
split
(
/^--$/
)
end
end
def
search_to_blob
(
result
)
def
parse_search_result
(
result
)
ref
=
nil
ref
=
nil
filename
=
nil
filename
=
nil
startline
=
0
startline
=
0
...
...
app/views/search/results/_blob.html.haml
View file @
9ab12e09
-
blob
=
@project
.
repository
.
search_to_blob
(
blob
)
-
blob
=
@project
.
repository
.
parse_search_result
(
blob
)
.blob-result
.blob-result
.file-holder
.file-holder
.file-title
.file-title
...
...
app/views/search/results/_wiki_blob.html.haml
View file @
9ab12e09
-
wiki_blob
=
@project
.
repository
.
parse_search_result
(
wiki_blob
)
.blob-result
.blob-result
.file-holder
.file-holder
.file-title
.file-title
...
...
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