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
c7f2be22
Commit
c7f2be22
authored
Dec 18, 2017
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change clair scope in Ci::Build
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
173bc2a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ee/app/models/ee/ci/build.rb
ee/app/models/ee/ci/build.rb
+1
-1
spec/ee/spec/serializers/merge_request_entity_spec.rb
spec/ee/spec/serializers/merge_request_entity_spec.rb
+1
-1
No files found.
ee/app/models/ee/ci/build.rb
View file @
c7f2be22
...
...
@@ -16,7 +16,7 @@ module EE
scope
:codequality
,
->
()
{
where
(
name:
%w[codequality codeclimate]
)
}
scope
:performance
,
->
()
{
where
(
name:
%w[performance deploy]
)
}
scope
:sast
,
->
()
{
where
(
name:
'sast'
)
}
scope
:clair
,
->
()
{
where
(
name:
'
clair
'
)
}
scope
:clair
,
->
()
{
where
(
name:
'
sast:image
'
)
}
after_save
:stick_build_if_status_changed
end
...
...
spec/ee/spec/serializers/merge_request_entity_spec.rb
View file @
c7f2be22
...
...
@@ -30,7 +30,7 @@ describe MergeRequestEntity do
end
it
'has clair data'
do
build
=
create
(
:ci_build
,
name:
'
clair
'
)
build
=
create
(
:ci_build
,
name:
'
sast:image
'
)
allow
(
subject
).
to
receive
(
:expose_clair_data?
).
and_return
(
true
)
allow
(
merge_request
).
to
receive
(
:clair_artifact
).
and_return
(
build
)
...
...
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