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
09821fba
Commit
09821fba
authored
Apr 22, 2021
by
Jacques Erasmus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update master to main
Updated the default branch name
parent
41d18ebb
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
7 deletions
+7
-7
ee/spec/frontend/analytics/repository_analytics/mock_data.js
ee/spec/frontend/analytics/repository_analytics/mock_data.js
+1
-1
ee/spec/frontend/epic/utils/epic_utils_spec.js
ee/spec/frontend/epic/utils/epic_utils_spec.js
+1
-1
ee/spec/frontend/on_demand_scans/components/on_demand_scans_form_spec.js
...d/on_demand_scans/components/on_demand_scans_form_spec.js
+1
-1
ee/spec/frontend/vulnerabilities/header_spec.js
ee/spec/frontend/vulnerabilities/header_spec.js
+2
-2
ee/spec/frontend/vulnerabilities/resolution_alert_spec.js
ee/spec/frontend/vulnerabilities/resolution_alert_spec.js
+1
-1
ee/spec/frontend/vulnerabilities/vulnerability_spec.js
ee/spec/frontend/vulnerabilities/vulnerability_spec.js
+1
-1
No files found.
ee/spec/frontend/analytics/repository_analytics/mock_data.js
View file @
09821fba
...
...
@@ -12,7 +12,7 @@ export const projects = [
name
:
'
test
'
,
id
:
1
,
repository
:
{
rootRef
:
'
ma
ster
'
,
rootRef
:
'
ma
in
'
,
},
codeCoveragePath
:
'
#
'
,
codeCoverageSummary
:
{
...
...
ee/spec/frontend/epic/utils/epic_utils_spec.js
View file @
09821fba
...
...
@@ -63,7 +63,7 @@ describe('epicUtils', () => {
const
tooltipText
=
epicUtils
.
getDateFromMilestonesTooltip
({
dateType
:
'
start
'
,
startDateSourcingMilestoneTitle
:
'
<svg width="100"><use xlink:href="/h5bp/html5-boilerplate/-/raw/ma
ster
/demo.svg#x" /></svg>
'
,
'
<svg width="100"><use xlink:href="/h5bp/html5-boilerplate/-/raw/ma
in
/demo.svg#x" /></svg>
'
,
startDateSourcingMilestoneDates
:
{
startDate
:
'
2020-12-23
'
,
dueDate
:
'
2021-01-28
'
,
...
...
ee/spec/frontend/on_demand_scans/components/on_demand_scans_form_spec.js
View file @
09821fba
...
...
@@ -22,7 +22,7 @@ import { scannerProfiles, siteProfiles } from '../mocks/mock_data';
const
URL_HOST
=
'
https://localhost/
'
;
const
helpPagePath
=
'
/application_security/dast/index#on-demand-scans
'
;
const
projectPath
=
'
group/project
'
;
const
defaultBranch
=
'
ma
ster
'
;
const
defaultBranch
=
'
ma
in
'
;
const
profilesLibraryPath
=
'
/security/configuration/dast_scans
'
;
const
scannerProfilesLibraryPath
=
'
/security/configuration/dast_scans#scanner-profiles
'
;
const
siteProfilesLibraryPath
=
'
/security/configuration/dast_scans#site-profiles
'
;
...
...
ee/spec/frontend/vulnerabilities/header_spec.js
View file @
09821fba
...
...
@@ -43,7 +43,7 @@ describe('Vulnerability Header', () => {
id
:
2
,
createdAt
:
new
Date
().
toISOString
(),
url
:
'
pipeline_url
'
,
sourceBranch
:
'
ma
ster
'
,
sourceBranch
:
'
ma
in
'
,
},
description
:
'
description
'
,
identifiers
:
'
identifiers
'
,
...
...
@@ -341,7 +341,7 @@ describe('Vulnerability Header', () => {
});
describe
(
'
when the vulnerability is no longer detected on the default branch
'
,
()
=>
{
const
branchName
=
'
ma
ster
'
;
const
branchName
=
'
ma
in
'
;
beforeEach
(()
=>
{
createWrapper
({
...
...
ee/spec/frontend/vulnerabilities/resolution_alert_spec.js
View file @
09821fba
...
...
@@ -5,7 +5,7 @@ import ResolutionAlert, { COOKIE_NAME } from 'ee/vulnerabilities/components/reso
describe
(
'
Vulnerability list component
'
,
()
=>
{
let
wrapper
;
const
defaultBranchName
=
'
not-always-ma
ster
'
;
const
defaultBranchName
=
'
not-always-ma
in
'
;
const
vulnerabilityId
=
61
;
const
createWrapper
=
(
options
=
{})
=>
{
...
...
ee/spec/frontend/vulnerabilities/vulnerability_spec.js
View file @
09821fba
...
...
@@ -22,7 +22,7 @@ describe('Vulnerability', () => {
id
:
2
,
created_at
:
new
Date
().
toISOString
(),
url
:
'
pipeline_url
'
,
sourceBranch
:
'
ma
ster
'
,
sourceBranch
:
'
ma
in
'
,
},
description
:
'
description
'
,
identifiers
:
'
identifiers
'
,
...
...
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