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
aa38efdb
Commit
aa38efdb
authored
8 years ago
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed merge conflicts in search services code
parent
5407b9db
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
23 deletions
+8
-23
app/services/search/global_service.rb
app/services/search/global_service.rb
+2
-6
app/services/search/project_service.rb
app/services/search/project_service.rb
+1
-7
app/services/search/snippet_service.rb
app/services/search/snippet_service.rb
+5
-10
No files found.
app/services/search/global_service.rb
View file @
aa38efdb
...
@@ -11,15 +11,11 @@ module Search
...
@@ -11,15 +11,11 @@ module Search
projects
=
ProjectsFinder
.
new
.
execute
(
current_user
)
projects
=
ProjectsFinder
.
new
.
execute
(
current_user
)
projects
=
projects
.
in_namespace
(
group
.
id
)
if
group
projects
=
projects
.
in_namespace
(
group
.
id
)
if
group
<<<<<<<
HEAD
if
Gitlab
.
config
.
elasticsearch
.
enabled
if
Gitlab
.
config
.
elasticsearch
.
enabled
Gitlab
::
Elastic
::
SearchResults
.
new
(
project
_ids
,
params
[
:search
])
Gitlab
::
Elastic
::
SearchResults
.
new
(
project
s
.
pluck
(
:id
)
,
params
[
:search
])
else
else
Gitlab
::
SearchResults
.
new
(
project
_id
s
,
params
[
:search
])
Gitlab
::
SearchResults
.
new
(
projects
,
params
[
:search
])
end
end
=======
Gitlab
::
SearchResults
.
new
(
projects
,
params
[
:search
])
>>>>>>>
ce
/
master
end
end
end
end
end
end
This diff is collapsed.
Click to expand it.
app/services/search/project_service.rb
View file @
aa38efdb
...
@@ -7,21 +7,15 @@ module Search
...
@@ -7,21 +7,15 @@ module Search
end
end
def
execute
def
execute
<<<<<<<
HEAD
if
Gitlab
.
config
.
elasticsearch
.
enabled
if
Gitlab
.
config
.
elasticsearch
.
enabled
Gitlab
::
Elastic
::
ProjectSearchResults
.
new
(
project
.
id
,
Gitlab
::
Elastic
::
ProjectSearchResults
.
new
(
project
.
id
,
params
[
:search
],
params
[
:search
],
params
[
:repository_ref
])
params
[
:repository_ref
])
else
else
Gitlab
::
ProjectSearchResults
.
new
(
project
.
id
,
Gitlab
::
ProjectSearchResults
.
new
(
project
,
params
[
:search
],
params
[
:search
],
params
[
:repository_ref
])
params
[
:repository_ref
])
end
end
=======
Gitlab
::
ProjectSearchResults
.
new
(
project
,
params
[
:search
],
params
[
:repository_ref
])
>>>>>>>
ce
/
master
end
end
end
end
end
end
This diff is collapsed.
Click to expand it.
app/services/search/snippet_service.rb
View file @
aa38efdb
...
@@ -7,19 +7,14 @@ module Search
...
@@ -7,19 +7,14 @@ module Search
end
end
def
execute
def
execute
<<<<<<<
HEAD
snippets
=
Snippet
.
accessible_to
(
current_user
)
snippet_ids
=
Snippet
.
accessible_to
(
current_user
).
pluck
(
:id
)
if
Gitlab
.
config
.
elasticsearch
.
enabled
if
Gitlab
.
config
.
elasticsearch
.
enabled
Gitlab
::
Elastic
::
SnippetSearchResults
.
new
(
snippet_ids
,
params
[
:search
])
Gitlab
::
Elastic
::
SnippetSearchResults
.
new
(
snippets
.
pluck
(
:id
),
else
params
[
:search
])
Gitlab
::
SnippetSearchResults
.
new
(
snippet_ids
,
params
[
:search
])
else
Gitlab
::
SnippetSearchResults
.
new
(
snippets
,
params
[
:search
])
end
end
=======
snippets
=
Snippet
.
accessible_to
(
current_user
)
Gitlab
::
SnippetSearchResults
.
new
(
snippets
,
params
[
:search
])
>>>>>>>
ce
/
master
end
end
end
end
end
end
This diff is collapsed.
Click to expand it.
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