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
dd4f6a66
Commit
dd4f6a66
authored
Apr 07, 2020
by
Tetiana Chupryna
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch to license_scanning path
parent
e753ca46
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
6 deletions
+1
-6
ee/app/controllers/ee/projects/merge_requests_controller.rb
ee/app/controllers/ee/projects/merge_requests_controller.rb
+0
-4
ee/app/views/projects/merge_requests/show.html.haml
ee/app/views/projects/merge_requests/show.html.haml
+1
-1
ee/config/routes/merge_requests.rb
ee/config/routes/merge_requests.rb
+0
-1
No files found.
ee/app/controllers/ee/projects/merge_requests_controller.rb
View file @
dd4f6a66
...
...
@@ -46,10 +46,6 @@ module EE
render_approvals_json
end
def
license_management_reports
reports_response
(
merge_request
.
compare_license_management_reports
(
current_user
))
end
def
license_scanning_reports
reports_response
(
merge_request
.
compare_license_management_reports
(
current_user
))
end
...
...
ee/app/views/projects/merge_requests/show.html.haml
View file @
dd4f6a66
...
...
@@ -17,7 +17,7 @@
window.gl.mrWidgetData.approvals_help_path = '
#{
help_page_path
(
"user/project/merge_requests/merge_request_approvals"
)
}
';
window.gl.mrWidgetData.codequality_help_path = '
#{
help_page_path
(
"user/project/merge_requests/code_quality"
,
anchor:
"code-quality-reports"
)
}
';
window.gl.mrWidgetData.visual_review_app_available = '
#{
@project
.
feature_available?
(
:visual_review_app
)
}
' === 'true';
window.gl.mrWidgetData.license_scanning_comparison_path = '
#{
license_
management_reports_project_merge_request_path
(
@project
,
@merge_request
)
if
@project
.
feature_available?
(
:license_management
)
}
'
window.gl.mrWidgetData.license_scanning_comparison_path = '
#{
license_
scanning_reports_project_merge_request_path
(
@project
,
@merge_request
)
if
@project
.
feature_available?
(
:license_scanning
)
}
'
window.gl.mrWidgetData.container_scanning_comparison_path = '
#{
container_scanning_reports_project_merge_request_path
(
@project
,
@merge_request
)
if
@project
.
feature_available?
(
:container_scanning
)
}
'
window.gl.mrWidgetData.dependency_scanning_comparison_path = '
#{
dependency_scanning_reports_project_merge_request_path
(
@project
,
@merge_request
)
if
@project
.
feature_available?
(
:dependency_scanning
)
}
'
window.gl.mrWidgetData.sast_comparison_path = '
#{
sast_reports_project_merge_request_path
(
@project
,
@merge_request
)
if
@project
.
feature_available?
(
:sast
)
}
'
...
...
ee/config/routes/merge_requests.rb
View file @
dd4f6a66
...
...
@@ -5,7 +5,6 @@ resources :merge_requests, only: [], constraints: { id: /\d+/ } do
get
'/descriptions/:version_id/diff'
,
action: :description_diff
,
as: :description_diff
delete
'/descriptions/:version_id'
,
action: :delete_description_version
,
as: :delete_description_version
get
:metrics_reports
get
:license_management_reports
get
:license_scanning_reports
get
:container_scanning_reports
get
:dependency_scanning_reports
...
...
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