1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
|
<script>
/* eslint-disable @gitlab/require-i18n-strings */
import { GlModal, GlLink, GlSprintf } from '@gitlab/ui';
import { helpPagePath } from '~/helpers/help_page_helper';
import { escapeShellString } from '~/lib/utils/text_utility';
import { __ } from '~/locale';
import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
export default {
i18n: {
steps: {
step1: {
label: __('Step 1.'),
help: __("Fetch and check out this merge request's feature branch:"),
},
step2: {
label: __('Step 2.'),
help: __('Review the changes locally.'),
},
step3: {
label: __('Step 3.'),
help: __(
'Merge the feature branch into the target branch and fix any conflicts. %{linkStart}How do I fix them?%{linkEnd}',
),
},
step4: {
label: __('Step 4.'),
help: __('Push the target branch up to GitLab.'),
},
},
copyCommands: __('Copy commands'),
tip: __(
'%{strongStart}Tip:%{strongEnd} You can also check out merge requests locally. %{linkStart}Learn more.%{linkEnd}',
),
title: __('Check out, review, and merge locally'),
},
components: {
GlModal,
ClipboardButton,
GlLink,
GlSprintf,
},
props: {
canMerge: {
type: Boolean,
required: false,
default: false,
},
isFork: {
type: Boolean,
required: false,
default: false,
},
sourceBranch: {
type: String,
required: false,
default: '',
},
sourceProjectPath: {
type: String,
required: false,
default: '',
},
targetBranch: {
type: String,
required: false,
default: '',
},
sourceProjectDefaultUrl: {
type: String,
required: false,
default: '',
},
reviewingDocsPath: {
type: String,
required: false,
default: null,
},
},
data() {
return {
resolveConflictsFromCli: helpPagePath('ee/user/project/merge_requests/conflicts.html', {
anchor: 'resolve-conflicts-from-the-command-line',
}),
};
},
computed: {
mergeInfo1() {
const escapedOriginBranch = escapeShellString(`origin/${this.sourceBranch}`);
return this.isFork
? `git fetch "${this.sourceProjectDefaultUrl}" ${this.escapedSourceBranch}\ngit checkout -b ${this.escapedForkBranch} FETCH_HEAD`
: `git fetch origin\ngit checkout -b ${this.escapedSourceBranch} ${escapedOriginBranch}`;
},
mergeInfo2() {
return this.isFork
? `git fetch origin\ngit checkout ${this.escapedTargetBranch}\ngit merge --no-ff ${this.escapedForkBranch}`
: `git fetch origin\ngit checkout ${this.escapedTargetBranch}\ngit merge --no-ff ${this.escapedSourceBranch}`;
},
mergeInfo3() {
return this.canMerge
? `git push origin ${this.escapedTargetBranch}`
: __('Note that pushing to GitLab requires write access to this repository.');
},
escapedForkBranch() {
return escapeShellString(`${this.sourceProjectPath}-${this.sourceBranch}`);
},
escapedTargetBranch() {
return escapeShellString(this.targetBranch);
},
escapedSourceBranch() {
return escapeShellString(this.sourceBranch);
},
},
};
</script>
<template>
<gl-modal
modal-id="modal-merge-info"
:no-enforce-focus="true"
:title="$options.i18n.title"
no-fade
hide-footer
>
<p>
<strong>
{{ $options.i18n.steps.step1.label }}
</strong>
{{ $options.i18n.steps.step1.help }}
</p>
<div class="gl-display-flex">
<pre class="gl-w-full" data-testid="how-to-merge-instructions">{{ mergeInfo1 }}</pre>
<clipboard-button
:text="mergeInfo1"
:title="$options.i18n.copyCommands"
class="gl-shadow-none! gl-bg-transparent! gl-flex-shrink-0"
/>
</div>
<p>
<strong>
{{ $options.i18n.steps.step2.label }}
</strong>
{{ $options.i18n.steps.step2.help }}
</p>
<p>
<strong>
{{ $options.i18n.steps.step3.label }}
</strong>
<gl-sprintf :message="$options.i18n.steps.step3.help">
<template #link="{ content }">
<gl-link class="gl-display-inline-block" :href="resolveConflictsFromCli">
{{ content }}
</gl-link>
</template>
</gl-sprintf>
</p>
<div class="gl-display-flex">
<pre class="gl-w-full" data-testid="how-to-merge-instructions">{{ mergeInfo2 }}</pre>
<clipboard-button
:text="mergeInfo2"
:title="$options.i18n.copyCommands"
class="gl-shadow-none! gl-bg-transparent! gl-flex-shrink-0"
/>
</div>
<p>
<strong>
{{ $options.i18n.steps.step4.label }}
</strong>
{{ $options.i18n.steps.step4.help }}
</p>
<div class="gl-display-flex">
<pre class="gl-w-full" data-testid="how-to-merge-instructions">{{ mergeInfo3 }}</pre>
<clipboard-button
:text="mergeInfo3"
:title="$options.i18n.copyCommands"
class="gl-shadow-none! gl-bg-transparent! gl-flex-shrink-0"
/>
</div>
<p v-if="reviewingDocsPath">
<gl-sprintf data-testid="docs-tip" :message="$options.i18n.tip">
<template #strong="{ content }">
<strong>{{ content }}</strong>
</template>
<template #link="{ content }">
<gl-link class="gl-display-inline-block" :href="reviewingDocsPath" target="_blank">{{
content
}}</gl-link>
</template>
</gl-sprintf>
</p>
</gl-modal>
</template>
|
