Commit afedb9b6 authored by Jacques Erasmus's avatar Jacques Erasmus Committed by jerasmus

Update master to main

Updated the default branch name
parent c4aae485
...@@ -18,7 +18,6 @@ export const resolvers = { ...@@ -18,7 +18,6 @@ export const resolvers = {
repository: { repository: {
__typename: 'Repository', __typename: 'Repository',
branches: [ branches: [
{ __typename: 'Branch', name: 'master' },
{ __typename: 'Branch', name: 'main' }, { __typename: 'Branch', name: 'main' },
{ __typename: 'Branch', name: 'develop' }, { __typename: 'Branch', name: 'develop' },
{ __typename: 'Branch', name: 'production' }, { __typename: 'Branch', name: 'production' },
......
...@@ -1237,8 +1237,8 @@ export const mockPipelineWithAttachedMR = { ...@@ -1237,8 +1237,8 @@ export const mockPipelineWithAttachedMR = {
title: 'Update README.md', title: 'Update README.md',
source_branch: 'feature-1234', source_branch: 'feature-1234',
source_branch_path: '/root/detached-merge-request-pipelines/branches/feature-1234', source_branch_path: '/root/detached-merge-request-pipelines/branches/feature-1234',
target_branch: 'master', target_branch: 'main',
target_branch_path: '/root/detached-merge-request-pipelines/branches/master', target_branch_path: '/root/detached-merge-request-pipelines/branches/main',
}, },
ref: { ref: {
name: 'test-branch', name: 'test-branch',
...@@ -1269,8 +1269,8 @@ export const mockPipelineDetached = { ...@@ -1269,8 +1269,8 @@ export const mockPipelineDetached = {
title: 'Update README.md', title: 'Update README.md',
source_branch: 'feature-1234', source_branch: 'feature-1234',
source_branch_path: '/root/detached-merge-request-pipelines/branches/feature-1234', source_branch_path: '/root/detached-merge-request-pipelines/branches/feature-1234',
target_branch: 'master', target_branch: 'main',
target_branch_path: '/root/detached-merge-request-pipelines/branches/master', target_branch_path: '/root/detached-merge-request-pipelines/branches/main',
}, },
ref: { ref: {
name: 'test-branch', name: 'test-branch',
...@@ -1296,8 +1296,8 @@ export const mockJobsInTable = [ ...@@ -1296,8 +1296,8 @@ export const mockJobsInTable = [
__typename: 'DetailedStatus', __typename: 'DetailedStatus',
}, },
id: 'gid://gitlab/Ci::Build/2004', id: 'gid://gitlab/Ci::Build/2004',
refName: 'master', refName: 'main',
refPath: '/root/ci-project/-/commits/master', refPath: '/root/ci-project/-/commits/main',
tags: [], tags: [],
shortSha: '2d5d8323', shortSha: '2d5d8323',
commitPath: '/root/ci-project/-/commit/2d5d83230bdea0e003d83ef4c16d2bf9a8808ebe', commitPath: '/root/ci-project/-/commit/2d5d83230bdea0e003d83ef4c16d2bf9a8808ebe',
...@@ -1334,8 +1334,8 @@ export const mockJobsInTable = [ ...@@ -1334,8 +1334,8 @@ export const mockJobsInTable = [
__typename: 'DetailedStatus', __typename: 'DetailedStatus',
}, },
id: 'gid://gitlab/Ci::Build/2021', id: 'gid://gitlab/Ci::Build/2021',
refName: 'master', refName: 'main',
refPath: '/root/ci-project/-/commits/master', refPath: '/root/ci-project/-/commits/main',
tags: [], tags: [],
shortSha: '2d5d8323', shortSha: '2d5d8323',
commitPath: '/root/ci-project/-/commit/2d5d83230bdea0e003d83ef4c16d2bf9a8808ebe', commitPath: '/root/ci-project/-/commit/2d5d83230bdea0e003d83ef4c16d2bf9a8808ebe',
...@@ -1379,8 +1379,8 @@ export const mockJobsInTable = [ ...@@ -1379,8 +1379,8 @@ export const mockJobsInTable = [
__typename: 'DetailedStatus', __typename: 'DetailedStatus',
}, },
id: 'gid://gitlab/Ci::Build/2015', id: 'gid://gitlab/Ci::Build/2015',
refName: 'master', refName: 'main',
refPath: '/root/ci-project/-/commits/master', refPath: '/root/ci-project/-/commits/main',
tags: [], tags: [],
shortSha: '2d5d8323', shortSha: '2d5d8323',
commitPath: '/root/ci-project/-/commit/2d5d83230bdea0e003d83ef4c16d2bf9a8808ebe', commitPath: '/root/ci-project/-/commit/2d5d83230bdea0e003d83ef4c16d2bf9a8808ebe',
......
...@@ -17,7 +17,7 @@ Object { ...@@ -17,7 +17,7 @@ Object {
"environment": "prd", "environment": "prd",
"except": Object { "except": Object {
"refs": Array [ "refs": Array [
"master@gitlab-org/gitlab", "main@gitlab-org/gitlab",
"/^release/.*$/@gitlab-org/gitlab", "/^release/.*$/@gitlab-org/gitlab",
], ],
}, },
...@@ -44,7 +44,7 @@ Object { ...@@ -44,7 +44,7 @@ Object {
"environment": "stg", "environment": "stg",
"except": Object { "except": Object {
"refs": Array [ "refs": Array [
"master@gitlab-org/gitlab", "main@gitlab-org/gitlab",
"/^release/.*$/@gitlab-org/gitlab", "/^release/.*$/@gitlab-org/gitlab",
], ],
}, },
......
...@@ -4,7 +4,7 @@ import { unwrapStagesWithNeeds } from '~/pipelines/components/unwrapping_utils'; ...@@ -4,7 +4,7 @@ import { unwrapStagesWithNeeds } from '~/pipelines/components/unwrapping_utils';
export const mockProjectNamespace = 'user1'; export const mockProjectNamespace = 'user1';
export const mockProjectPath = 'project1'; export const mockProjectPath = 'project1';
export const mockProjectFullPath = `${mockProjectNamespace}/${mockProjectPath}`; export const mockProjectFullPath = `${mockProjectNamespace}/${mockProjectPath}`;
export const mockDefaultBranch = 'master'; export const mockDefaultBranch = 'main';
export const mockNewMergeRequestPath = '/-/merge_requests/new'; export const mockNewMergeRequestPath = '/-/merge_requests/new';
export const mockCommitSha = 'aabbccdd'; export const mockCommitSha = 'aabbccdd';
export const mockCommitNextSha = 'eeffgghh'; export const mockCommitNextSha = 'eeffgghh';
...@@ -143,7 +143,6 @@ export const mockProjectBranches = { ...@@ -143,7 +143,6 @@ export const mockProjectBranches = {
repository: { repository: {
__typename: 'Repository', __typename: 'Repository',
branches: [ branches: [
{ __typename: 'Branch', name: 'master' },
{ __typename: 'Branch', name: 'main' }, { __typename: 'Branch', name: 'main' },
{ __typename: 'Branch', name: 'develop' }, { __typename: 'Branch', name: 'develop' },
{ __typename: 'Branch', name: 'production' }, { __typename: 'Branch', name: 'production' },
...@@ -186,7 +185,7 @@ export const mockLintResponse = { ...@@ -186,7 +185,7 @@ export const mockLintResponse = {
when: 'on_success', when: 'on_success',
allow_failure: false, allow_failure: false,
only: null, only: null,
except: { refs: ['master@gitlab-org/gitlab', '/^release/.*$/@gitlab-org/gitlab'] }, except: { refs: ['main@gitlab-org/gitlab', '/^release/.*$/@gitlab-org/gitlab'] },
}, },
{ {
name: 'job_2', name: 'job_2',
...@@ -199,7 +198,7 @@ export const mockLintResponse = { ...@@ -199,7 +198,7 @@ export const mockLintResponse = {
when: 'on_success', when: 'on_success',
allow_failure: true, allow_failure: true,
only: { refs: ['web', 'chat', 'pushes'] }, only: { refs: ['web', 'chat', 'pushes'] },
except: { refs: ['master@gitlab-org/gitlab', '/^release/.*$/@gitlab-org/gitlab'] }, except: { refs: ['main@gitlab-org/gitlab', '/^release/.*$/@gitlab-org/gitlab'] },
}, },
], ],
}; };
...@@ -242,7 +241,7 @@ export const mockJobs = [ ...@@ -242,7 +241,7 @@ export const mockJobs = [
when: 'on_success', when: 'on_success',
allowFailure: false, allowFailure: false,
only: { refs: ['branches@gitlab-org/gitlab'] }, only: { refs: ['branches@gitlab-org/gitlab'] },
except: { refs: ['master@gitlab-org/gitlab', '/^release/.*$/@gitlab-org/gitlab'] }, except: { refs: ['main@gitlab-org/gitlab', '/^release/.*$/@gitlab-org/gitlab'] },
}, },
]; ];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment