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
9d17ce42
Commit
9d17ce42
authored
May 11, 2020
by
Jonathan Schafer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move source_branch to pipeline_json
parent
070005ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
ee/app/helpers/vulnerabilities_helper.rb
ee/app/helpers/vulnerabilities_helper.rb
+2
-2
ee/spec/helpers/vulnerabilities_helper_spec.rb
ee/spec/helpers/vulnerabilities_helper_spec.rb
+2
-2
No files found.
ee/app/helpers/vulnerabilities_helper.rb
View file @
9d17ce42
...
@@ -14,7 +14,6 @@ module VulnerabilitiesHelper
...
@@ -14,7 +14,6 @@ module VulnerabilitiesHelper
has_mr:
!!
vulnerability
.
finding
.
merge_request_feedback
.
try
(
:merge_request_iid
),
has_mr:
!!
vulnerability
.
finding
.
merge_request_feedback
.
try
(
:merge_request_iid
),
vulnerability_feedback_help_path:
help_page_path
(
'user/application_security/index'
,
anchor:
'interacting-with-the-vulnerabilities'
),
vulnerability_feedback_help_path:
help_page_path
(
'user/application_security/index'
,
anchor:
'interacting-with-the-vulnerabilities'
),
finding_json:
vulnerability_finding_data
(
vulnerability
.
finding
).
to_json
,
finding_json:
vulnerability_finding_data
(
vulnerability
.
finding
).
to_json
,
source_branch:
pipeline
&
.
ref
.
to_s
,
create_mr_url:
create_vulnerability_feedback_merge_request_path
(
vulnerability
.
finding
.
project
),
create_mr_url:
create_vulnerability_feedback_merge_request_path
(
vulnerability
.
finding
.
project
),
timestamp:
Time
.
now
.
to_i
timestamp:
Time
.
now
.
to_i
}
}
...
@@ -26,7 +25,8 @@ module VulnerabilitiesHelper
...
@@ -26,7 +25,8 @@ module VulnerabilitiesHelper
{
{
id:
pipeline
.
id
,
id:
pipeline
.
id
,
created_at:
pipeline
.
created_at
.
iso8601
,
created_at:
pipeline
.
created_at
.
iso8601
,
url:
pipeline_path
(
pipeline
)
url:
pipeline_path
(
pipeline
),
source_branch:
pipeline
.
ref
}
}
end
end
...
...
ee/spec/helpers/vulnerabilities_helper_spec.rb
View file @
9d17ce42
...
@@ -65,7 +65,6 @@ describe VulnerabilitiesHelper do
...
@@ -65,7 +65,6 @@ describe VulnerabilitiesHelper do
has_mr:
anything
,
has_mr:
anything
,
vulnerability_feedback_help_path:
kind_of
(
String
),
vulnerability_feedback_help_path:
kind_of
(
String
),
finding_json:
kind_of
(
String
),
finding_json:
kind_of
(
String
),
source_branch:
kind_of
(
String
),
create_mr_url:
"/
#{
project
.
full_path
}
/-/vulnerability_feedback"
,
create_mr_url:
"/
#{
project
.
full_path
}
/-/vulnerability_feedback"
,
timestamp:
Time
.
now
.
to_i
timestamp:
Time
.
now
.
to_i
)
)
...
@@ -85,7 +84,8 @@ describe VulnerabilitiesHelper do
...
@@ -85,7 +84,8 @@ describe VulnerabilitiesHelper do
expect
(
pipelineData
).
to
include
(
expect
(
pipelineData
).
to
include
(
'id'
=>
pipeline
.
id
,
'id'
=>
pipeline
.
id
,
'created_at'
=>
pipeline
.
created_at
.
iso8601
,
'created_at'
=>
pipeline
.
created_at
.
iso8601
,
'url'
=>
be_present
'url'
=>
be_present
,
'source_branch'
=>
pipeline
.
ref
)
)
end
end
end
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