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
4958c793
Commit
4958c793
authored
Jun 27, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
ff9ec99f
db6a6d29
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
1 deletion
+19
-1
app/views/shared/projects/_list.html.haml
app/views/shared/projects/_list.html.haml
+1
-1
changelogs/unreleased/sh-avoid-loading-pipeline-status.yml
changelogs/unreleased/sh-avoid-loading-pipeline-status.yml
+5
-0
spec/controllers/search_controller_spec.rb
spec/controllers/search_controller_spec.rb
+13
-0
No files found.
app/views/shared/projects/_list.html.haml
View file @
4958c793
...
...
@@ -28,7 +28,7 @@
.js-projects-list-holder
-
if
any_projects?
(
projects
)
-
load_pipeline_status
(
projects
)
-
load_pipeline_status
(
projects
)
if
pipeline_status
%ul
.projects-list
{
class:
css_classes
}
-
projects
.
each_with_index
do
|
project
,
i
|
-
css_class
=
(
i
>=
projects_limit
)
||
project
.
pending_delete?
?
'hide'
:
nil
...
...
changelogs/unreleased/sh-avoid-loading-pipeline-status.yml
0 → 100644
View file @
4958c793
---
title
:
Avoid loading pipeline status in search results
merge_request
:
30111
author
:
type
:
performance
spec/controllers/search_controller_spec.rb
View file @
4958c793
...
...
@@ -39,6 +39,19 @@ describe SearchController do
end
end
context
'global search'
do
render_views
it
'omits pipeline status from load'
do
project
=
create
(
:project
,
:public
)
expect
(
Gitlab
::
Cache
::
Ci
::
ProjectPipelineStatus
).
not_to
receive
(
:load_in_batch_for_projects
)
get
:show
,
params:
{
scope:
'projects'
,
search:
project
.
name
}
expect
(
assigns
[
:search_objects
].
first
).
to
eq
project
end
end
it
'finds issue comments'
do
project
=
create
(
:project
,
:public
)
note
=
create
(
:note_on_issue
,
project:
project
)
...
...
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