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
b8438780
Commit
b8438780
authored
Apr 07, 2020
by
Tetiana Chupryna
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update naming for licence_scanning
parent
dd4f6a66
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
ee/app/controllers/ee/projects/merge_requests_controller.rb
ee/app/controllers/ee/projects/merge_requests_controller.rb
+1
-1
ee/app/models/ee/merge_request.rb
ee/app/models/ee/merge_request.rb
+3
-3
No files found.
ee/app/controllers/ee/projects/merge_requests_controller.rb
View file @
b8438780
...
...
@@ -47,7 +47,7 @@ module EE
end
def
license_scanning_reports
reports_response
(
merge_request
.
compare_license_
management
_reports
(
current_user
))
reports_response
(
merge_request
.
compare_license_
scanning
_reports
(
current_user
))
end
def
container_scanning_reports
...
...
ee/app/models/ee/merge_request.rb
View file @
b8438780
...
...
@@ -183,7 +183,7 @@ module EE
compare_reports
(
::
Ci
::
CompareDependencyScanningReportsService
,
current_user
)
end
def
has_license_
management
_reports?
def
has_license_
scanning
_reports?
!!
(
actual_head_pipeline
&
.
has_reports?
(
::
Ci
::
JobArtifact
.
license_scanning_reports
))
end
...
...
@@ -217,8 +217,8 @@ module EE
compare_reports
(
::
Ci
::
CompareDastReportsService
,
current_user
)
end
def
compare_license_
management
_reports
(
current_user
)
return
missing_report_error
(
"license
management"
)
unless
has_license_management
_reports?
def
compare_license_
scanning
_reports
(
current_user
)
return
missing_report_error
(
"license
scanning"
)
unless
has_license_scanning
_reports?
compare_reports
(
::
Ci
::
CompareLicenseScanningReportsService
,
current_user
)
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