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
a5be4d59
Commit
a5be4d59
authored
Apr 21, 2021
by
Jacques Erasmus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update master to main
Updated the default branch name
parent
0c171090
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
spec/frontend/monitoring/components/dashboards_dropdown_spec.js
...rontend/monitoring/components/dashboards_dropdown_spec.js
+1
-1
spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js
...nd/monitoring/components/duplicate_dashboard_form_spec.js
+1
-1
spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js
...d/monitoring/components/duplicate_dashboard_modal_spec.js
+1
-1
spec/frontend/monitoring/mock_data.js
spec/frontend/monitoring/mock_data.js
+9
-9
No files found.
spec/frontend/monitoring/components/dashboards_dropdown_spec.js
View file @
a5be4d59
...
...
@@ -6,7 +6,7 @@ import DashboardsDropdown from '~/monitoring/components/dashboards_dropdown.vue'
import
{
dashboardGitResponse
}
from
'
../mock_data
'
;
const
defaultBranch
=
'
ma
ster
'
;
const
defaultBranch
=
'
ma
in
'
;
const
starredDashboards
=
dashboardGitResponse
.
filter
(({
starred
})
=>
starred
);
const
notStarredDashboards
=
dashboardGitResponse
.
filter
(({
starred
})
=>
!
starred
);
...
...
spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js
View file @
a5be4d59
...
...
@@ -16,7 +16,7 @@ const createMountedWrapper = (props = {}) => {
};
describe
(
'
DuplicateDashboardForm
'
,
()
=>
{
const
defaultBranch
=
'
ma
ster
'
;
const
defaultBranch
=
'
ma
in
'
;
const
findByRef
=
(
ref
)
=>
wrapper
.
find
({
ref
});
const
setValue
=
(
ref
,
val
)
=>
{
...
...
spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js
View file @
a5be4d59
...
...
@@ -37,7 +37,7 @@ describe('duplicate dashboard modal', () => {
return
shallowMount
(
DuplicateDashboardModal
,
{
propsData
:
{
defaultBranch
:
'
ma
ster
'
,
defaultBranch
:
'
ma
in
'
,
modalId
:
'
id
'
,
},
store
,
...
...
spec/frontend/monitoring/mock_data.js
View file @
a5be4d59
...
...
@@ -15,7 +15,7 @@ const customDashboardsData = new Array(30).fill(null).map((_, idx) => ({
can_edit
:
true
,
system_dashboard
:
false
,
out_of_the_box_dashboard
:
false
,
project_blob_path
:
`
${
mockProjectDir
}
/blob/ma
ster
/dashboards/.gitlab/dashboards/dashboard_
${
idx
}
.yml`
,
project_blob_path
:
`
${
mockProjectDir
}
/blob/ma
in
/dashboards/.gitlab/dashboards/dashboard_
${
idx
}
.yml`
,
path
:
`.gitlab/dashboards/dashboard_
${
idx
}
.yml`
,
starred
:
false
,
}));
...
...
@@ -32,7 +32,7 @@ export const anomalyDeploymentData = [
iid
:
3
,
sha
:
'
f5bcd1d9dac6fa4137e2510b9ccd134ef2e84187
'
,
ref
:
{
name
:
'
ma
ster
'
,
name
:
'
ma
in
'
,
},
created_at
:
'
2019-08-19T22:00:00.000Z
'
,
deployed_at
:
'
2019-08-19T22:01:00.000Z
'
,
...
...
@@ -44,7 +44,7 @@ export const anomalyDeploymentData = [
iid
:
2
,
sha
:
'
f5bcd1d9dac6fa4137e2510b9ccd134ef2e84187
'
,
ref
:
{
name
:
'
ma
ster
'
,
name
:
'
ma
in
'
,
},
created_at
:
'
2019-08-19T23:00:00.000Z
'
,
deployed_at
:
'
2019-08-19T23:00:00.000Z
'
,
...
...
@@ -61,7 +61,7 @@ export const deploymentData = [
commitUrl
:
'
http://test.host/frontend-fixtures/environments-project/-/commit/f5bcd1d9dac6fa4137e2510b9ccd134ef2e84187
'
,
ref
:
{
name
:
'
ma
ster
'
,
name
:
'
ma
in
'
,
},
created_at
:
'
2019-07-16T10:14:25.589Z
'
,
tag
:
false
,
...
...
@@ -75,7 +75,7 @@ export const deploymentData = [
commitUrl
:
'
http://test.host/frontend-fixtures/environments-project/-/commit/f5bcd1d9dac6fa4137e2510b9ccd134ef2e84187
'
,
ref
:
{
name
:
'
ma
ster
'
,
name
:
'
ma
in
'
,
},
created_at
:
'
2019-07-16T11:14:25.589Z
'
,
tag
:
false
,
...
...
@@ -187,7 +187,7 @@ export const dashboardGitResponse = [
can_edit
:
true
,
system_dashboard
:
false
,
out_of_the_box_dashboard
:
false
,
project_blob_path
:
`
${
mockProjectDir
}
/-/blob/ma
ster
/.gitlab/dashboards/dashboard.yml`
,
project_blob_path
:
`
${
mockProjectDir
}
/-/blob/ma
in
/.gitlab/dashboards/dashboard.yml`
,
path
:
'
.gitlab/dashboards/dashboard.yml
'
,
starred
:
true
,
user_starred_path
:
`
${
mockProjectDir
}
/metrics_user_starred_dashboards?dashboard_path=.gitlab/dashboards/dashboard.yml`
,
...
...
@@ -224,7 +224,7 @@ export const selfMonitoringDashboardGitResponse = [
can_edit
:
true
,
system_dashboard
:
false
,
out_of_the_box_dashboard
:
false
,
project_blob_path
:
`
${
mockProjectDir
}
/-/blob/ma
ster
/.gitlab/dashboards/dashboard.yml`
,
project_blob_path
:
`
${
mockProjectDir
}
/-/blob/ma
in
/.gitlab/dashboards/dashboard.yml`
,
path
:
'
.gitlab/dashboards/dashboard.yml
'
,
starred
:
true
,
user_starred_path
:
`
${
mockProjectDir
}
/metrics_user_starred_dashboards?dashboard_path=.gitlab/dashboards/dashboard.yml`
,
...
...
@@ -572,7 +572,7 @@ export const storeVariables = [
];
export
const
dashboardHeaderProps
=
{
defaultBranch
:
'
ma
ster
'
,
defaultBranch
:
'
ma
in
'
,
isRearrangingPanels
:
false
,
selectedTimeRange
:
{
start
:
'
2020-01-01T00:00:00.000Z
'
,
...
...
@@ -581,7 +581,7 @@ export const dashboardHeaderProps = {
};
export
const
dashboardActionsMenuProps
=
{
defaultBranch
:
'
ma
ster
'
,
defaultBranch
:
'
ma
in
'
,
addingMetricsAvailable
:
true
,
customMetricsPath
:
'
https://path/to/customMetrics
'
,
validateQueryPath
:
'
https://path/to/validateQuery
'
,
...
...
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