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
1d09e554
Commit
1d09e554
authored
Apr 22, 2021
by
Jacques Erasmus
Committed by
Miguel Rincon
Apr 28, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update master to main
Updated the default branch name
parent
7aee55b0
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
17 deletions
+17
-17
ee/spec/frontend/compliance_dashboard/components/merge_requests/branch_details_spec.js
...ashboard/components/merge_requests/branch_details_spec.js
+6
-6
ee/spec/frontend/compliance_dashboard/components/merge_requests/grid_spec.js
...mpliance_dashboard/components/merge_requests/grid_spec.js
+1
-1
ee/spec/frontend/security_dashboard/components/fuzzing_artifacts_download_spec.js
...y_dashboard/components/fuzzing_artifacts_download_spec.js
+2
-2
ee/spec/frontend/security_dashboard/components/mock_data.js
ee/spec/frontend/security_dashboard/components/mock_data.js
+1
-1
ee/spec/frontend/security_dashboard/store/modules/vulnerabilities/data/mock_data_vulnerabilities.js
...modules/vulnerabilities/data/mock_data_vulnerabilities.js
+7
-7
No files found.
ee/spec/frontend/compliance_dashboard/components/merge_requests/branch_details_spec.js
View file @
1d09e554
...
...
@@ -18,7 +18,7 @@ describe('BranchDetails component', () => {
uri
:
sourceUri
,
},
targetBranch
:
{
name
:
'
ma
ster
'
,
name
:
'
ma
in
'
,
uri
:
targetUri
,
},
},
...
...
@@ -40,13 +40,13 @@ describe('BranchDetails component', () => {
});
it
(
'
has the correct text
'
,
()
=>
{
expect
(
getText
()).
toEqual
(
'
feature into ma
ster
'
);
expect
(
getText
()).
toEqual
(
'
feature into ma
in
'
);
});
});
describe
(
'
and one branch URI
'
,
()
=>
{
beforeEach
(()
=>
{
wrapper
=
createComponent
({
targetUri
:
'
/ma
ster
-uri
'
});
wrapper
=
createComponent
({
targetUri
:
'
/ma
in
-uri
'
});
});
it
(
'
has one link
'
,
()
=>
{
...
...
@@ -58,13 +58,13 @@ describe('BranchDetails component', () => {
});
it
(
'
has the correct text
'
,
()
=>
{
expect
(
getText
()).
toEqual
(
'
feature into ma
ster
'
);
expect
(
getText
()).
toEqual
(
'
feature into ma
in
'
);
});
});
describe
(
'
and both branch URIs
'
,
()
=>
{
beforeEach
(()
=>
{
wrapper
=
createComponent
({
sourceUri
:
'
/feature-uri
'
,
targetUri
:
'
/ma
ster
-uri
'
});
wrapper
=
createComponent
({
sourceUri
:
'
/feature-uri
'
,
targetUri
:
'
/ma
in
-uri
'
});
});
it
(
'
has two links
'
,
()
=>
{
...
...
@@ -80,7 +80,7 @@ describe('BranchDetails component', () => {
});
it
(
'
has the correct text
'
,
()
=>
{
expect
(
getText
()).
toEqual
(
'
feature into ma
ster
'
);
expect
(
getText
()).
toEqual
(
'
feature into ma
in
'
);
});
});
});
...
...
ee/spec/frontend/compliance_dashboard/components/merge_requests/grid_spec.js
View file @
1d09e554
...
...
@@ -80,7 +80,7 @@ describe('MergeRequestsGrid component', () => {
wrapper
=
createComponent
(
createMergeRequests
({
count
:
2
,
props
:
{
target_branch
:
'
ma
ster
'
,
source_branch
:
'
feature
'
},
props
:
{
target_branch
:
'
ma
in
'
,
source_branch
:
'
feature
'
},
}),
);
expect
(
findBranchDetails
().
exists
()).
toBe
(
true
);
...
...
ee/spec/frontend/security_dashboard/components/fuzzing_artifacts_download_spec.js
View file @
1d09e554
...
...
@@ -10,8 +10,8 @@ localVue.use(Vuex);
describe
(
'
Filter component
'
,
()
=>
{
const
projectId
=
1
;
const
jobs
=
[
{
ref
:
'
ma
ster
'
,
name
:
'
fuzz
'
},
{
ref
:
'
ma
ster
'
,
name
:
'
fuzz 2
'
},
{
ref
:
'
ma
in
'
,
name
:
'
fuzz
'
},
{
ref
:
'
ma
in
'
,
name
:
'
fuzz 2
'
},
];
let
wrapper
;
...
...
ee/spec/frontend/security_dashboard/components/mock_data.js
View file @
1d09e554
...
...
@@ -26,7 +26,7 @@ export const generateVulnerabilities = () => [
resolvedOnDefaultBranch
:
true
,
location
:
{
image
:
'
registry.gitlab.com/groulot/container-scanning-test/ma
ster
:5f21de6956aee99ddb68ae49498662d9872f50ff
'
,
'
registry.gitlab.com/groulot/container-scanning-test/ma
in
:5f21de6956aee99ddb68ae49498662d9872f50ff
'
,
},
project
:
{
nameWithNamespace
:
'
Administrator / Security reports
'
,
...
...
ee/spec/frontend/security_dashboard/store/modules/vulnerabilities/data/mock_data_vulnerabilities.js
View file @
1d09e554
...
...
@@ -177,7 +177,7 @@ export default [
},
category
:
'
sast
'
,
feedback_type
:
'
dismissal
'
,
branch
:
'
ma
ster
'
,
branch
:
'
ma
in
'
,
project_fingerprint
:
'
4e5b6966dd100170b4b1ad599c7058cce91b57b4
'
,
destroy_vulnerability_feedback_dismissal_path
:
'
https://example.com/feedback_dismissal_path
'
,
},
...
...
@@ -258,7 +258,7 @@ export default [
issue_url
:
'
http://localhost/namespace1/project1/issues/1
'
,
category
:
'
sast
'
,
feedback_type
:
'
issue
'
,
branch
:
'
ma
ster
'
,
branch
:
'
ma
in
'
,
project_fingerprint
:
'
4e5b6966dd100170b4b1ad599c7058cce91b57b4
'
,
},
create_vulnerability_feedback_issue_path
:
'
https://example.com/vulnerability_feedback
'
,
...
...
@@ -336,7 +336,7 @@ export default [
},
category
:
'
sast
'
,
feedback_type
:
'
dismissal
'
,
branch
:
'
ma
ster
'
,
branch
:
'
ma
in
'
,
project_fingerprint
:
'
4e5b6966dd100170b4b1ad599c7058cce91b57b4
'
,
destroy_vulnerability_feedback_dismissal_path
:
'
https://example.com/feedback_dismissal_path
'
,
},
...
...
@@ -362,7 +362,7 @@ export default [
issue_url
:
'
http://localhost/namespace1/project1/issues/1
'
,
category
:
'
sast
'
,
feedback_type
:
'
issue
'
,
branch
:
'
ma
ster
'
,
branch
:
'
ma
in
'
,
project_fingerprint
:
'
4e5b6966dd100170b4b1ad599c7058cce91b57b4
'
,
},
create_vulnerability_feedback_issue_path
:
'
https://example.com/vulnerability_feedback
'
,
...
...
@@ -496,7 +496,7 @@ export default [
issue_url
:
null
,
category
:
'
sast
'
,
feedback_type
:
'
issue
'
,
branch
:
'
ma
ster
'
,
branch
:
'
ma
in
'
,
project_fingerprint
:
'
4e5b6966dd100170b4b1ad599c7058cce91b57b4
'
,
},
vulnerability_feedback_issue_path
:
'
https://example.com/vulnerability_feedback
'
,
...
...
@@ -562,7 +562,7 @@ export default [
],
location
:
{
image
:
'
registry.gitlab.com/groulot/container-scanning-test/ma
ster
:5f21de6956aee99ddb68ae49498662d9872f50ff
'
,
'
registry.gitlab.com/groulot/container-scanning-test/ma
in
:5f21de6956aee99ddb68ae49498662d9872f50ff
'
,
operating_system
:
'
debian:9
'
,
dependency
:
{
package
:
{
...
...
@@ -620,7 +620,7 @@ export default [
],
location
:
{
image
:
'
registry.gitlab.com/groulot/container-scanning-test/ma
ster
:5f21de6956aee99ddb68ae49498662d9872f50ff
'
,
'
registry.gitlab.com/groulot/container-scanning-test/ma
in
:5f21de6956aee99ddb68ae49498662d9872f50ff
'
,
operating_system
:
'
debian:9
'
,
dependency
:
{
package
:
{
...
...
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