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
71601000
Commit
71601000
authored
Nov 05, 2018
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve `sast` usage
parent
2ac65b13
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
74 deletions
+6
-74
ee/app/models/ee/ci/build.rb
ee/app/models/ee/ci/build.rb
+0
-2
ee/spec/controllers/projects/pipelines_controller_spec.rb
ee/spec/controllers/projects/pipelines_controller_spec.rb
+1
-12
ee/spec/features/projects/pipelines/pipeline_spec.rb
ee/spec/features/projects/pipelines/pipeline_spec.rb
+2
-24
ee/spec/models/ci/pipeline_spec.rb
ee/spec/models/ci/pipeline_spec.rb
+1
-12
ee/spec/models/project_spec.rb
ee/spec/models/project_spec.rb
+2
-24
No files found.
ee/app/models/ee/ci/build.rb
View file @
71601000
...
...
@@ -7,8 +7,6 @@ module EE
module
Build
extend
ActiveSupport
::
Concern
LICENSE_MANAGEMENT_FILE
=
'gl-license-management-report.json'
.
freeze
LICENSED_PARSER_FEATURES
=
{
sast: :sast
}.
with_indifferent_access
.
freeze
...
...
ee/spec/controllers/projects/pipelines_controller_spec.rb
View file @
71601000
...
...
@@ -15,18 +15,7 @@ describe Projects::PipelinesController do
context
'with a sast artifact'
do
before
do
create
(
:ci_build
,
:success
,
:artifacts
,
name:
'sast'
,
pipeline:
pipeline
,
options:
{
artifacts:
{
paths:
[
Ci
::
JobArtifact
::
DEFAULT_FILE_NAMES
[
:sast
]]
}
}
)
create
(
:ci_build
,
:legacy_sast
,
pipeline:
pipeline
)
end
context
'with feature enabled'
do
...
...
ee/spec/features/projects/pipelines/pipeline_spec.rb
View file @
71601000
...
...
@@ -18,18 +18,7 @@ describe 'Pipeline', :js do
context
'with a sast artifact'
do
before
do
create
(
:ci_build
,
:success
,
:artifacts
,
name:
'sast'
,
pipeline:
pipeline
,
options:
{
artifacts:
{
paths:
[
Ci
::
JobArtifact
::
DEFAULT_FILE_NAMES
[
:sast
]]
}
}
)
create
(
:ci_build
,
:legacy_sast
,
pipeline:
pipeline
)
visit
security_project_pipeline_path
(
project
,
pipeline
)
end
...
...
@@ -66,18 +55,7 @@ describe 'Pipeline', :js do
context
'with a license management artifact'
do
before
do
create
(
:ci_build
,
:success
,
:artifacts
,
name:
'license_management'
,
pipeline:
pipeline
,
options:
{
artifacts:
{
paths:
[
Ci
::
Build
::
LICENSE_MANAGEMENT_FILE
]
}
}
)
create
(
:ee_ci_build
,
:legacy_license_management
,
pipeline:
pipeline
)
visit
licenses_project_pipeline_path
(
project
,
pipeline
)
end
...
...
ee/spec/models/ci/pipeline_spec.rb
View file @
71601000
...
...
@@ -28,18 +28,7 @@ describe Ci::Pipeline do
let
(
:pipeline_5
)
{
create
(
:ci_pipeline_without_jobs
,
project:
project
)
}
before
do
create
(
:ci_build
,
:success
,
:artifacts
,
name:
'sast'
,
pipeline:
pipeline_1
,
options:
{
artifacts:
{
paths:
[
Ci
::
JobArtifact
::
DEFAULT_FILE_NAMES
[
:sast
]]
}
}
)
create
(
:ci_build
,
:legacy_sast
,
pipeline:
pipeline_1
)
create
(
:ci_build
,
:success
,
...
...
ee/spec/models/project_spec.rb
View file @
71601000
...
...
@@ -1503,30 +1503,8 @@ describe Project do
let
(
:pipeline_3
)
{
create
(
:ci_pipeline_without_jobs
,
project:
project
)
}
before
do
create
(
:ci_build
,
:success
,
:artifacts
,
name:
'sast'
,
pipeline:
pipeline_1
,
options:
{
artifacts:
{
paths:
[
Ci
::
JobArtifact
::
DEFAULT_FILE_NAMES
[
:sast
]]
}
}
)
create
(
:ci_build
,
:success
,
:artifacts
,
name:
'sast'
,
pipeline:
pipeline_2
,
options:
{
artifacts:
{
paths:
[
Ci
::
JobArtifact
::
DEFAULT_FILE_NAMES
[
:sast
]]
}
}
)
create
(
:ci_build
,
:legacy_sast
,
pipeline:
pipeline_1
)
create
(
:ci_build
,
:legacy_sast
,
pipeline:
pipeline_2
)
end
it
"returns the latest pipeline with security reports"
do
...
...
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