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
72ea8193
Commit
72ea8193
authored
Oct 04, 2019
by
Tetiana Chupryna
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename expose license management method
parent
5a5b9ec3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
ee/app/controllers/ee/projects/pipelines_controller.rb
ee/app/controllers/ee/projects/pipelines_controller.rb
+1
-1
ee/app/models/ee/ci/pipeline.rb
ee/app/models/ee/ci/pipeline.rb
+1
-1
ee/app/views/projects/pipelines/_tabs_content.html.haml
ee/app/views/projects/pipelines/_tabs_content.html.haml
+1
-1
ee/app/views/projects/pipelines/_tabs_holder.html.haml
ee/app/views/projects/pipelines/_tabs_holder.html.haml
+1
-1
No files found.
ee/app/controllers/ee/projects/pipelines_controller.rb
View file @
72ea8193
...
@@ -25,7 +25,7 @@ module EE
...
@@ -25,7 +25,7 @@ module EE
end
end
def
licenses
def
licenses
report_exists
=
pipeline
.
expose_license_
management
_data?
report_exists
=
pipeline
.
expose_license_
scanning
_data?
respond_to
do
|
format
|
respond_to
do
|
format
|
if
report_exists
if
report_exists
...
...
ee/app/models/ee/ci/pipeline.rb
View file @
72ea8193
...
@@ -121,7 +121,7 @@ module EE
...
@@ -121,7 +121,7 @@ module EE
job_artifacts
.
where
(
file_type:
::
Ci
::
JobArtifact
.
file_types
[
file_type
]).
last
job_artifacts
.
where
(
file_type:
::
Ci
::
JobArtifact
.
file_types
[
file_type
]).
last
end
end
def
expose_license_
management
_data?
def
expose_license_
scanning
_data?
any_report_artifact_for_type
(
:license_management
)
any_report_artifact_for_type
(
:license_management
)
end
end
...
...
ee/app/views/projects/pipelines/_tabs_content.html.haml
View file @
72ea8193
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
create_vulnerability_feedback_merge_request_path:
create_vulnerability_feedback_merge_request_path
(
project
),
create_vulnerability_feedback_merge_request_path:
create_vulnerability_feedback_merge_request_path
(
project
),
create_vulnerability_feedback_dismissal_path:
create_vulnerability_feedback_dismissal_path
(
project
)
}
}
create_vulnerability_feedback_dismissal_path:
create_vulnerability_feedback_dismissal_path
(
project
)
}
}
-
if
pipeline
.
expose_license_
management
_data?
-
if
pipeline
.
expose_license_
scanning
_data?
#js-tab-licenses
.tab-pane
#js-tab-licenses
.tab-pane
#js-licenses-app
{
data:
{
license_head_path:
pipeline
.
downloadable_path_for_report_type
(
:license_management
),
#js-licenses-app
{
data:
{
license_head_path:
pipeline
.
downloadable_path_for_report_type
(
:license_management
),
api_url:
license_management_api_url
(
project
),
api_url:
license_management_api_url
(
project
),
...
...
ee/app/views/projects/pipelines/_tabs_holder.html.haml
View file @
72ea8193
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
=
_
(
"Security"
)
=
_
(
"Security"
)
%span
.badge.badge-pill.js-security-counter.hidden
{
'data-qa-selector'
:
'security_counter'
}
%span
.badge.badge-pill.js-security-counter.hidden
{
'data-qa-selector'
:
'security_counter'
}
-
if
pipeline
.
expose_license_
management
_data?
-
if
pipeline
.
expose_license_
scanning
_data?
%li
.js-licenses-tab-link
%li
.js-licenses-tab-link
=
link_to
licenses_project_pipeline_path
(
project
,
pipeline
),
data:
{
target:
'#js-tab-licenses'
,
action:
'licenses'
,
toggle:
'tab'
},
class:
'licenses-tab'
do
=
link_to
licenses_project_pipeline_path
(
project
,
pipeline
),
data:
{
target:
'#js-tab-licenses'
,
action:
'licenses'
,
toggle:
'tab'
},
class:
'licenses-tab'
do
=
_
(
"Licenses"
)
=
_
(
"Licenses"
)
...
...
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