Skip to content

G
gitlab-ce
Commit 1b99e5bf authored by Jacques Erasmus's avatar Jacques Erasmus Committed by Brandon Labuschagne
Browse files
Options

Update master to main 

Updated the default branch
parent 912665e9
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 38 deletions
ee/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
View file @ 1b99e5bf
...@@ -49,7 +49,7 @@ describe('ReadyToMerge', () => { ...@@ -49,7 +49,7 @@ describe('ReadyToMerge', () => {
commitMessageWithDescription: 'This is the commit message description', commitMessageWithDescription: 'This is the commit message description',
shouldRemoveSourceBranch: true, shouldRemoveSourceBranch: true,
canRemoveSourceBranch: false, canRemoveSourceBranch: false,
targetBranch: 'master', targetBranch: 'main',
preferredAutoMergeStrategy: MWPS_MERGE_STRATEGY, preferredAutoMergeStrategy: MWPS_MERGE_STRATEGY,
availableAutoMergeStrategies: [MWPS_MERGE_STRATEGY], availableAutoMergeStrategies: [MWPS_MERGE_STRATEGY],
mergeImmediatelyDocsPath: 'path/to/merge/immediately/docs', mergeImmediatelyDocsPath: 'path/to/merge/immediately/docs',
......
spec/frontend/vue_mr_widget/components/mr_widget_header_spec.js
View file @ 1b99e5bf
...@@ -34,7 +34,7 @@ describe('MRWidgetHeader', () => { ...@@ -34,7 +34,7 @@ describe('MRWidgetHeader', () => {
divergedCommitsCount: 12, divergedCommitsCount: 12,
sourceBranch: 'mr-widget-refactor', sourceBranch: 'mr-widget-refactor',
sourceBranchLink: '<a href="/foo/bar/mr-widget-refactor">Link</a>', sourceBranchLink: '<a href="/foo/bar/mr-widget-refactor">Link</a>',
targetBranch: 'master', targetBranch: 'main',
statusPath: 'abc', statusPath: 'abc',
}, },
}); });
...@@ -48,7 +48,7 @@ describe('MRWidgetHeader', () => { ...@@ -48,7 +48,7 @@ describe('MRWidgetHeader', () => {
divergedCommitsCount: 0, divergedCommitsCount: 0,
sourceBranch: 'mr-widget-refactor', sourceBranch: 'mr-widget-refactor',
sourceBranchLink: '<a href="/foo/bar/mr-widget-refactor">Link</a>', sourceBranchLink: '<a href="/foo/bar/mr-widget-refactor">Link</a>',
targetBranch: 'master', targetBranch: 'main',
statusPath: 'abc', statusPath: 'abc',
}, },
}); });
...@@ -64,14 +64,14 @@ describe('MRWidgetHeader', () => { ...@@ -64,14 +64,14 @@ describe('MRWidgetHeader', () => {
divergedCommitsCount: 1, divergedCommitsCount: 1,
sourceBranch: 'mr-widget-refactor', sourceBranch: 'mr-widget-refactor',
sourceBranchLink: '<a href="/foo/bar/mr-widget-refactor">Link</a>', sourceBranchLink: '<a href="/foo/bar/mr-widget-refactor">Link</a>',
targetBranch: 'master', targetBranch: 'main',
targetBranchPath: '/foo/bar/master', targetBranchPath: '/foo/bar/main',
statusPath: 'abc', statusPath: 'abc',
}, },
}); });
expect(wrapper.vm.commitsBehindText).toBe( expect(wrapper.vm.commitsBehindText).toBe(
'The source branch is <a href="/foo/bar/master">1 commit behind</a> the target branch', 'The source branch is <a href="/foo/bar/main">1 commit behind</a> the target branch',
); );
}); });
...@@ -81,14 +81,14 @@ describe('MRWidgetHeader', () => { ...@@ -81,14 +81,14 @@ describe('MRWidgetHeader', () => {
divergedCommitsCount: 2, divergedCommitsCount: 2,
sourceBranch: 'mr-widget-refactor', sourceBranch: 'mr-widget-refactor',
sourceBranchLink: '<a href="/foo/bar/mr-widget-refactor">Link</a>', sourceBranchLink: '<a href="/foo/bar/mr-widget-refactor">Link</a>',
targetBranch: 'master', targetBranch: 'main',
targetBranchPath: '/foo/bar/master', targetBranchPath: '/foo/bar/main',
statusPath: 'abc', statusPath: 'abc',
}, },
}); });
expect(wrapper.vm.commitsBehindText).toBe( expect(wrapper.vm.commitsBehindText).toBe(
'The source branch is <a href="/foo/bar/master">2 commits behind</a> the target branch', 'The source branch is <a href="/foo/bar/main">2 commits behind</a> the target branch',
); );
}); });
}); });
...@@ -105,7 +105,7 @@ describe('MRWidgetHeader', () => { ...@@ -105,7 +105,7 @@ describe('MRWidgetHeader', () => {
sourceBranchRemoved: false, sourceBranchRemoved: false,
targetBranchPath: 'foo/bar/commits-path', targetBranchPath: 'foo/bar/commits-path',
targetBranchTreePath: 'foo/bar/tree/path', targetBranchTreePath: 'foo/bar/tree/path',
targetBranch: 'master', targetBranch: 'main',
isOpen: true, isOpen: true,
emailPatchesPath: '/mr/email-patches', emailPatchesPath: '/mr/email-patches',
plainDiffPath: '/mr/plainDiffPath', plainDiffPath: '/mr/plainDiffPath',
...@@ -125,7 +125,7 @@ describe('MRWidgetHeader', () => { ...@@ -125,7 +125,7 @@ describe('MRWidgetHeader', () => {
}); });
it('renders target branch', () => { it('renders target branch', () => {
expect(wrapper.find('.js-target-branch').text().trim()).toBe('master'); expect(wrapper.find('.js-target-branch').text().trim()).toBe('main');
}); });
}); });
...@@ -138,7 +138,7 @@ describe('MRWidgetHeader', () => { ...@@ -138,7 +138,7 @@ describe('MRWidgetHeader', () => {
sourceBranchRemoved: false, sourceBranchRemoved: false,
targetBranchPath: 'foo/bar/commits-path', targetBranchPath: 'foo/bar/commits-path',
targetBranchTreePath: 'foo/bar/tree/path', targetBranchTreePath: 'foo/bar/tree/path',
targetBranch: 'master', targetBranch: 'main',
isOpen: true, isOpen: true,
canPushToSourceBranch: true, canPushToSourceBranch: true,
emailPatchesPath: '/mr/email-patches', emailPatchesPath: '/mr/email-patches',
...@@ -227,7 +227,7 @@ describe('MRWidgetHeader', () => { ...@@ -227,7 +227,7 @@ describe('MRWidgetHeader', () => {
sourceBranchRemoved: false, sourceBranchRemoved: false,
targetBranchPath: 'foo/bar/commits-path', targetBranchPath: 'foo/bar/commits-path',
targetBranchTreePath: 'foo/bar/tree/path', targetBranchTreePath: 'foo/bar/tree/path',
targetBranch: 'master', targetBranch: 'main',
isOpen: false, isOpen: false,
emailPatchesPath: '/mr/email-patches', emailPatchesPath: '/mr/email-patches',
plainDiffPath: '/mr/plainDiffPath', plainDiffPath: '/mr/plainDiffPath',
...@@ -257,7 +257,7 @@ describe('MRWidgetHeader', () => { ...@@ -257,7 +257,7 @@ describe('MRWidgetHeader', () => {
sourceBranchRemoved: false, sourceBranchRemoved: false,
targetBranchPath: 'foo/bar/commits-path', targetBranchPath: 'foo/bar/commits-path',
targetBranchTreePath: 'foo/bar/tree/path', targetBranchTreePath: 'foo/bar/tree/path',
targetBranch: 'master', targetBranch: 'main',
isOpen: true, isOpen: true,
emailPatchesPath: '/mr/email-patches', emailPatchesPath: '/mr/email-patches',
plainDiffPath: '/mr/plainDiffPath', plainDiffPath: '/mr/plainDiffPath',
...@@ -281,7 +281,7 @@ describe('MRWidgetHeader', () => { ...@@ -281,7 +281,7 @@ describe('MRWidgetHeader', () => {
sourceBranchRemoved: false, sourceBranchRemoved: false,
targetBranchPath: 'foo/bar/commits-path', targetBranchPath: 'foo/bar/commits-path',
targetBranchTreePath: 'foo/bar/tree/path', targetBranchTreePath: 'foo/bar/tree/path',
targetBranch: 'master', targetBranch: 'main',
isOpen: true, isOpen: true,
emailPatchesPath: '/mr/email-patches', emailPatchesPath: '/mr/email-patches',
plainDiffPath: '/mr/plainDiffPath', plainDiffPath: '/mr/plainDiffPath',
......
spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js
View file @ 1b99e5bf
...@@ -8,7 +8,7 @@ describe('Commits header component', () => { ...@@ -8,7 +8,7 @@ describe('Commits header component', () => {
wrapper = shallowMount(CommitsHeader, { wrapper = shallowMount(CommitsHeader, {
propsData: { propsData: {
isSquashEnabled: false, isSquashEnabled: false,
targetBranch: 'master', targetBranch: 'main',
commitsCount: 5, commitsCount: 5,
isFastForwardEnabled: false, isFastForwardEnabled: false,
...props, ...props,
...@@ -94,7 +94,7 @@ describe('Commits header component', () => { ...@@ -94,7 +94,7 @@ describe('Commits header component', () => {
it('has correct target branch displayed', () => { it('has correct target branch displayed', () => {
createComponent(); createComponent();
expect(findTargetBranchMessage().text()).toBe('master'); expect(findTargetBranchMessage().text()).toBe('main');
}); });
it('does has merge commit part of the message', () => { it('does has merge commit part of the message', () => {
......
spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
View file @ 1b99e5bf
...@@ -42,7 +42,7 @@ const createTestMr = (customConfig) => { ...@@ -42,7 +42,7 @@ const createTestMr = (customConfig) => {
commitMessageWithDescription, commitMessageWithDescription,
shouldRemoveSourceBranch: true, shouldRemoveSourceBranch: true,
canRemoveSourceBranch: false, canRemoveSourceBranch: false,
targetBranch: 'master', targetBranch: 'main',
preferredAutoMergeStrategy: MWPS_MERGE_STRATEGY, preferredAutoMergeStrategy: MWPS_MERGE_STRATEGY,
availableAutoMergeStrategies: [MWPS_MERGE_STRATEGY], availableAutoMergeStrategies: [MWPS_MERGE_STRATEGY],
mergeImmediatelyDocsPath: 'path/to/merge/immediately/docs', mergeImmediatelyDocsPath: 'path/to/merge/immediately/docs',
......
spec/frontend/vue_mr_widget/deployment/deployment_mock_data.js
View file @ 1b99e5bf
...@@ -45,15 +45,15 @@ const deploymentMockData = { ...@@ -45,15 +45,15 @@ const deploymentMockData = {
changes: [ changes: [
{ {
path: 'index.html', path: 'index.html',
external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/index.html', external_url: 'http://root-main-patch-91341.volatile-watch.surge.sh/index.html',
}, },
{ {
path: 'imgs/gallery.html', path: 'imgs/gallery.html',
external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/imgs/gallery.html', external_url: 'http://root-main-patch-91341.volatile-watch.surge.sh/imgs/gallery.html',
}, },
{ {
path: 'about/', path: 'about/',
external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/about/', external_url: 'http://root-main-patch-91341.volatile-watch.surge.sh/about/',
}, },
], ],
}; };
......
spec/frontend/vue_mr_widget/mock_data.js
View file @ 1b99e5bf
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
source_branch_link: 'daaaa', source_branch_link: 'daaaa',
source_project_id: 19, source_project_id: 19,
source_project_full_path: '/group1/project1', source_project_full_path: '/group1/project1',
target_branch: 'master', target_branch: 'main',
target_project_id: 19, target_project_id: 19,
target_project_full_path: '/group2/project2', target_project_full_path: '/group2/project2',
merge_request_add_ci_config_path: '/group2/project2/new/pipeline', merge_request_add_ci_config_path: '/group2/project2/new/pipeline',
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
diff_head_sha: '104096c51715e12e7ae41f9333e9fa35b73f385d', diff_head_sha: '104096c51715e12e7ae41f9333e9fa35b73f385d',
diff_head_commit_short_id: '104096c5', diff_head_commit_short_id: '104096c5',
default_merge_commit_message: default_merge_commit_message:
"Merge branch 'daaaa' into 'master'\n\nUpdate README.md\n\nSee merge request !22", "Merge branch 'daaaa' into 'main'\n\nUpdate README.md\n\nSee merge request !22",
pipeline: { pipeline: {
id: 172, id: 172,
user: { user: {
...@@ -173,8 +173,8 @@ export default { ...@@ -173,8 +173,8 @@ export default {
title: 'Update README.md', title: 'Update README.md',
source_branch: 'feature-1', source_branch: 'feature-1',
source_branch_path: '/root/detached-merge-request-pipelines/branches/feature-1', source_branch_path: '/root/detached-merge-request-pipelines/branches/feature-1',
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',
}, },
commit: { commit: {
id: '104096c51715e12e7ae41f9333e9fa35b73f385d', id: '104096c51715e12e7ae41f9333e9fa35b73f385d',
...@@ -243,7 +243,7 @@ export default { ...@@ -243,7 +243,7 @@ export default {
head_path: 'blob_path', head_path: 'blob_path',
}, },
codequality_help_path: 'code_quality.html', codequality_help_path: 'code_quality.html',
target_branch_path: '/root/acets-app/branches/master', target_branch_path: '/root/acets-app/branches/main',
source_branch_path: '/root/acets-app/branches/daaaa', source_branch_path: '/root/acets-app/branches/daaaa',
conflict_resolution_ui_path: '/root/acets-app/-/merge_requests/22/conflicts', conflict_resolution_ui_path: '/root/acets-app/-/merge_requests/22/conflicts',
remove_wip_path: '/root/acets-app/-/merge_requests/22/remove_wip', remove_wip_path: '/root/acets-app/-/merge_requests/22/remove_wip',
...@@ -264,7 +264,7 @@ export default { ...@@ -264,7 +264,7 @@ export default {
ci_environments_status_url: '/root/acets-app/-/merge_requests/22/ci_environments_status', ci_environments_status_url: '/root/acets-app/-/merge_requests/22/ci_environments_status',
project_archived: false, project_archived: false,
default_merge_commit_message_with_description: default_merge_commit_message_with_description:
"Merge branch 'daaaa' into 'master'\n\nUpdate README.md\n\nSee merge request !22", "Merge branch 'daaaa' into 'main'\n\nUpdate README.md\n\nSee merge request !22",
default_squash_commit_message: 'Test squash commit message', default_squash_commit_message: 'Test squash commit message',
diverged_commits_count: 0, diverged_commits_count: 0,
only_allow_merge_if_pipeline_succeeds: false, only_allow_merge_if_pipeline_succeeds: false,
......
spec/frontend/vue_mr_widget/mr_widget_options_spec.js
View file @ 1b99e5bf
...@@ -559,15 +559,15 @@ describe('MrWidgetOptions', () => { ...@@ -559,15 +559,15 @@ describe('MrWidgetOptions', () => {
const changes = [ const changes = [
{ {
path: 'index.html', path: 'index.html',
external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/index.html', external_url: 'http://root-main-patch-91341.volatile-watch.surge.sh/index.html',
}, },
{ {
path: 'imgs/gallery.html', path: 'imgs/gallery.html',
external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/imgs/gallery.html', external_url: 'http://root-main-patch-91341.volatile-watch.surge.sh/imgs/gallery.html',
}, },
{ {
path: 'about/', path: 'about/',
external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/about/', external_url: 'http://root-main-patch-91341.volatile-watch.surge.sh/about/',
}, },
]; ];
const deploymentMockData = { const deploymentMockData = {
...@@ -688,22 +688,22 @@ describe('MrWidgetOptions', () => { ...@@ -688,22 +688,22 @@ describe('MrWidgetOptions', () => {
scheduled_actions: [], scheduled_actions: [],
}, },
ref: { ref: {
name: 'master', name: 'main',
path: '/root/ci-web-terminal/commits/master', path: '/root/ci-web-terminal/commits/main',
tag: false, tag: false,
branch: true, branch: true,
}, },
commit: { commit: {
id: 'aa1939133d373c94879becb79d91828a892ee319', id: 'aa1939133d373c94879becb79d91828a892ee319',
short_id: 'aa193913', short_id: 'aa193913',
title: "Merge branch 'master-test' into 'master'", title: "Merge branch 'main-test' into 'main'",
created_at: '2018-10-22T11:41:33.000Z', created_at: '2018-10-22T11:41:33.000Z',
parent_ids: [ parent_ids: [
'4622f4dd792468993003caf2e3be978798cbe096', '4622f4dd792468993003caf2e3be978798cbe096',
'76598df914cdfe87132d0c3c40f80db9fa9396a4', '76598df914cdfe87132d0c3c40f80db9fa9396a4',
], ],
message: message:
"Merge branch 'master-test' into 'master'\n\nUpdate .gitlab-ci.yml\n\nSee merge request root/ci-web-terminal!1", "Merge branch 'main-test' into 'main'\n\nUpdate .gitlab-ci.yml\n\nSee merge request root/ci-web-terminal!1",
author_name: 'Administrator', author_name: 'Administrator',
author_email: 'admin@example.com', author_email: 'admin@example.com',
authored_date: '2018-10-22T11:41:33.000Z', authored_date: '2018-10-22T11:41:33.000Z',
...@@ -751,17 +751,16 @@ describe('MrWidgetOptions', () => { ...@@ -751,17 +751,16 @@ describe('MrWidgetOptions', () => {
changes: [ changes: [
{ {
path: 'index.html', path: 'index.html',
external_url: external_url: 'http://root-main-patch-91341.volatile-watch.surge.sh/index.html',
'http://root-master-patch-91341.volatile-watch.surge.sh/index.html',
}, },
{ {
path: 'imgs/gallery.html', path: 'imgs/gallery.html',
external_url: external_url:
'http://root-master-patch-91341.volatile-watch.surge.sh/imgs/gallery.html', 'http://root-main-patch-91341.volatile-watch.surge.sh/imgs/gallery.html',
}, },
{ {
path: 'about/', path: 'about/',
external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/about/', external_url: 'http://root-main-patch-91341.volatile-watch.surge.sh/about/',
}, },
], ],
status: 'success', status: 'success',
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7