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
3d24f8bc
Commit
3d24f8bc
authored
Apr 28, 2021
by
Maxime Orefice
Committed by
Douglas Barbosa Alexandre
Apr 28, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not expose artifacts on pipeline index
parent
0052257c
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
63 additions
and
21 deletions
+63
-21
app/assets/javascripts/pipelines/components/pipelines_list/pipeline_operations.vue
...pelines/components/pipelines_list/pipeline_operations.vue
+2
-4
app/controllers/projects/pipelines_controller.rb
app/controllers/projects/pipelines_controller.rb
+1
-1
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+8
-0
app/serializers/pipeline_details_entity.rb
app/serializers/pipeline_details_entity.rb
+2
-1
changelogs/unreleased/mo-dont-expose-artifacts-on-pipeline-index.yml
...unreleased/mo-dont-expose-artifacts-on-pipeline-index.yml
+5
-0
spec/features/projects/pipelines/pipelines_spec.rb
spec/features/projects/pipelines/pipelines_spec.rb
+0
-14
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+14
-0
spec/serializers/pipeline_details_entity_spec.rb
spec/serializers/pipeline_details_entity_spec.rb
+31
-1
No files found.
app/assets/javascripts/pipelines/components/pipelines_list/pipeline_operations.vue
View file @
3d24f8bc
...
@@ -41,7 +41,7 @@ export default {
...
@@ -41,7 +41,7 @@ export default {
this
.
pipeline
.
flags
.
retryable
||
this
.
pipeline
.
flags
.
retryable
||
this
.
pipeline
.
flags
.
cancelable
||
this
.
pipeline
.
flags
.
cancelable
||
this
.
pipeline
.
details
.
manual_actions
.
length
||
this
.
pipeline
.
details
.
manual_actions
.
length
||
this
.
pipeline
.
details
.
artifacts
.
length
this
.
pipeline
.
details
.
has_downloadable_artifacts
);
);
},
},
actions
()
{
actions
()
{
...
@@ -55,9 +55,7 @@ export default {
...
@@ -55,9 +55,7 @@ export default {
return
this
.
cancelingPipeline
===
this
.
pipeline
.
id
;
return
this
.
cancelingPipeline
===
this
.
pipeline
.
id
;
},
},
showArtifacts
()
{
showArtifacts
()
{
return
(
return
this
.
pipeline
.
details
.
has_downloadable_artifacts
;
this
.
pipeline
.
details
.
artifacts
?.
length
||
this
.
pipeline
.
details
.
has_downloadable_artifacts
);
},
},
},
},
watch
:
{
watch
:
{
...
...
app/controllers/projects/pipelines_controller.rb
View file @
3d24f8bc
...
@@ -218,7 +218,7 @@ class Projects::PipelinesController < Projects::ApplicationController
...
@@ -218,7 +218,7 @@ class Projects::PipelinesController < Projects::ApplicationController
PipelineSerializer
PipelineSerializer
.
new
(
project:
@project
,
current_user:
@current_user
)
.
new
(
project:
@project
,
current_user:
@current_user
)
.
with_pagination
(
request
,
response
)
.
with_pagination
(
request
,
response
)
.
represent
(
@pipelines
,
disable_coverage:
true
,
preload:
true
)
.
represent
(
@pipelines
,
disable_coverage:
true
,
preload:
true
,
disable_artifacts:
true
)
end
end
def
render_show
def
render_show
...
...
app/models/ci/pipeline.rb
View file @
3d24f8bc
...
@@ -1076,6 +1076,14 @@ module Ci
...
@@ -1076,6 +1076,14 @@ module Ci
complete?
&&
builds
.
latest
.
with_exposed_artifacts
.
exists?
complete?
&&
builds
.
latest
.
with_exposed_artifacts
.
exists?
end
end
def
has_downloadable_artifacts?
if
downloadable_artifacts
.
loaded?
downloadable_artifacts
.
any?
else
downloadable_artifacts
.
exists?
end
end
def
branch_updated?
def
branch_updated?
strong_memoize
(
:branch_updated
)
do
strong_memoize
(
:branch_updated
)
do
push_details
.
branch_updated?
push_details
.
branch_updated?
...
...
app/serializers/pipeline_details_entity.rb
View file @
3d24f8bc
...
@@ -8,7 +8,8 @@ class PipelineDetailsEntity < Ci::PipelineEntity
...
@@ -8,7 +8,8 @@ class PipelineDetailsEntity < Ci::PipelineEntity
end
end
expose
:details
do
expose
:details
do
expose
:artifacts
do
|
pipeline
,
options
|
expose
:has_downloadable_artifacts?
,
as: :has_downloadable_artifacts
expose
:artifacts
,
unless:
proc
{
options
[
:disable_artifacts
]
}
do
|
pipeline
,
options
|
rel
=
pipeline
.
downloadable_artifacts
rel
=
pipeline
.
downloadable_artifacts
if
Feature
.
enabled?
(
:non_public_artifacts
,
type: :development
)
if
Feature
.
enabled?
(
:non_public_artifacts
,
type: :development
)
...
...
changelogs/unreleased/mo-dont-expose-artifacts-on-pipeline-index.yml
0 → 100644
View file @
3d24f8bc
---
title
:
Stop exposing artifacts on pipelines.json
merge_request
:
60126
author
:
type
:
performance
spec/features/projects/pipelines/pipelines_spec.rb
View file @
3d24f8bc
...
@@ -460,20 +460,6 @@ RSpec.describe 'Pipelines', :js do
...
@@ -460,20 +460,6 @@ RSpec.describe 'Pipelines', :js do
it
'has artifacts dropdown'
do
it
'has artifacts dropdown'
do
expect
(
page
).
to
have_selector
(
'[data-testid="pipeline-multi-actions-dropdown"]'
)
expect
(
page
).
to
have_selector
(
'[data-testid="pipeline-multi-actions-dropdown"]'
)
end
end
it
'has artifacts download dropdown'
do
find
(
'[data-testid="pipeline-multi-actions-dropdown"]'
).
click
expect
(
page
).
to
have_link
(
with_artifacts
.
file_type
)
end
it
'has download attribute on download links'
do
find
(
'[data-testid="pipeline-multi-actions-dropdown"]'
).
click
expect
(
page
).
to
have_selector
(
'a'
,
text:
'Download'
)
page
.
all
(
'[data-testid="artifact-item"]'
,
text:
'Download'
).
each
do
|
link
|
expect
(
link
[
:download
]).
to
eq
''
end
end
end
end
context
'with artifacts expired'
do
context
'with artifacts expired'
do
...
...
spec/models/ci/pipeline_spec.rb
View file @
3d24f8bc
...
@@ -4437,4 +4437,18 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do
...
@@ -4437,4 +4437,18 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep do
.
not_to
exceed_query_limit
(
control_count
)
.
not_to
exceed_query_limit
(
control_count
)
end
end
end
end
describe
'#has_downloadable_artifacts?'
do
it
'returns false when when pipeline does not have downloadable artifacts'
do
pipeline
=
create
(
:ci_pipeline
,
:success
)
expect
(
pipeline
.
has_downloadable_artifacts?
).
to
eq
(
false
)
end
it
'returns false when when pipeline does not have downloadable artifacts'
do
pipeline
=
create
(
:ci_pipeline
,
:with_codequality_reports
)
expect
(
pipeline
.
has_downloadable_artifacts?
).
to
eq
(
true
)
end
end
end
end
spec/serializers/pipeline_details_entity_spec.rb
View file @
3d24f8bc
...
@@ -32,7 +32,7 @@ RSpec.describe PipelineDetailsEntity do
...
@@ -32,7 +32,7 @@ RSpec.describe PipelineDetailsEntity do
expect
(
subject
[
:details
])
expect
(
subject
[
:details
])
.
to
include
:duration
,
:finished_at
.
to
include
:duration
,
:finished_at
expect
(
subject
[
:details
])
expect
(
subject
[
:details
])
.
to
include
:stages
,
:artifacts
,
:manual_actions
,
:scheduled_actions
.
to
include
:stages
,
:artifacts
,
:
has_downloadable_artifacts
,
:
manual_actions
,
:scheduled_actions
expect
(
subject
[
:details
][
:status
]).
to
include
:icon
,
:favicon
,
:text
,
:label
expect
(
subject
[
:details
][
:status
]).
to
include
:icon
,
:favicon
,
:text
,
:label
end
end
...
@@ -186,5 +186,35 @@ RSpec.describe PipelineDetailsEntity do
...
@@ -186,5 +186,35 @@ RSpec.describe PipelineDetailsEntity do
end
end
it_behaves_like
'public artifacts'
it_behaves_like
'public artifacts'
context
'when pipeline has downloadable artifacts'
do
subject
(
:entity
)
{
described_class
.
represent
(
pipeline
,
request:
request
,
disable_artifacts:
disable_artifacts
).
as_json
}
let_it_be
(
:pipeline
)
{
create
(
:ci_pipeline
,
:with_codequality_reports
)
}
context
'when disable_artifacts is true'
do
subject
(
:entity
)
{
described_class
.
represent
(
pipeline
,
request:
request
,
disable_artifacts:
true
).
as_json
}
it
'excludes artifacts data'
do
expect
(
entity
[
:details
]).
not_to
include
(
:artifacts
)
end
it
'returns true for has_downloadable_artifacts'
do
expect
(
entity
[
:details
][
:has_downloadable_artifacts
]).
to
eq
(
true
)
end
end
context
'when disable_artifacts is false'
do
subject
(
:entity
)
{
described_class
.
represent
(
pipeline
,
request:
request
,
disable_artifacts:
false
).
as_json
}
it
'includes artifacts data'
do
expect
(
entity
[
:details
]).
to
include
(
:artifacts
)
end
it
'returns true for has_downloadable_artifacts'
do
expect
(
entity
[
:details
][
:has_downloadable_artifacts
]).
to
eq
(
true
)
end
end
end
end
end
end
end
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