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
6c22e997
Commit
6c22e997
authored
Dec 14, 2017
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename clair feature to sast_image
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
f4e91ecd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ee/app/models/license.rb
ee/app/models/license.rb
+1
-1
ee/app/serializers/ee/merge_request_entity.rb
ee/app/serializers/ee/merge_request_entity.rb
+1
-1
No files found.
ee/app/models/license.rb
View file @
6c22e997
...
...
@@ -55,8 +55,8 @@ class License < ActiveRecord::Base
EEU_FEATURES
=
EEP_FEATURES
+
%i[
sast
sast_image
epics
clair
]
.
freeze
# List all features available for early adopters,
...
...
ee/app/serializers/ee/merge_request_entity.rb
View file @
6c22e997
...
...
@@ -78,7 +78,7 @@ module EE
end
def
expose_clair_data?
(
mr
,
current_user
)
mr
.
project
.
feature_available?
(
:
clair
)
&&
mr
.
project
.
feature_available?
(
:
sast_image
)
&&
mr
.
has_clair_data?
&&
can?
(
current_user
,
:read_build
,
mr
.
clair_artifact
)
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