Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
06a2e385
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
06a2e385
编写于
5月 11, 2018
作者:
A
Annabel Dunstone Gray
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make it explicit that merge conflict feature commits to source branch
上级
c6f72ac9
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
22 addition
and
10 deletion
+22
-10
app/assets/javascripts/merge_conflicts/merge_conflict_store.js
...ssets/javascripts/merge_conflicts/merge_conflict_store.js
+1
-1
app/assets/stylesheets/pages/merge_conflicts.scss
app/assets/stylesheets/pages/merge_conflicts.scss
+9
-1
app/views/projects/merge_requests/conflicts/_submit_form.html.haml
.../projects/merge_requests/conflicts/_submit_form.html.haml
+8
-4
doc/user/project/merge_requests/resolve_conflicts.md
doc/user/project/merge_requests/resolve_conflicts.md
+1
-1
spec/features/merge_request/user_resolves_conflicts_spec.rb
spec/features/merge_request/user_resolves_conflicts_spec.rb
+3
-3
未找到文件。
app/assets/javascripts/merge_conflicts/merge_conflict_store.js
浏览文件 @
06a2e385
...
...
@@ -351,7 +351,7 @@ import Cookies from 'js-cookie';
},
getCommitButtonText
()
{
const
initial
=
'
Commit
conflict resolution
'
;
const
initial
=
'
Commit
to source branch
'
;
const
inProgress
=
'
Committing...
'
;
return
this
.
state
?
this
.
state
.
isSubmitting
?
inProgress
:
initial
:
initial
;
...
...
app/assets/stylesheets/pages/merge_conflicts.scss
浏览文件 @
06a2e385
...
...
@@ -286,6 +286,14 @@ $colors: (
}
.resolve-conflicts-form
{
padding-top
:
$gl-padding
;
h4
{
margin-top
:
0
;
}
.resolve-info
{
@media
(
max-width
:
$screen-md-max
)
{
margin-bottom
:
$gl-padding
;
}
}
}
}
app/views/projects/merge_requests/conflicts/_submit_form.html.haml
浏览文件 @
06a2e385
%hr
.form-horizontal.resolve-conflicts-form
.form-group
%label
.col-sm-2.control-label
{
"for"
=>
"commit-message"
}
#{
_
(
'Commit message'
)
}
.col-sm-10
.col-md-4
%h4
Resolve conflicts on source branch
.resolve-info
Resolve the merge conflict by choosing Ours or Theirs in all the conflicted files above. Commit these changes into {{conflictsData.sourceBranch}}.
.col-md-8
%label
.label-light
{
"for"
=>
"commit-message"
}
#{
_
(
'Commit message'
)
}
.commit-message-container
.max-width-marker
%textarea
.form-control.js-commit-message
#commit-message
{
"v-model"
=>
"conflictsData.commitMessage"
,
"rows"
=>
"5"
}
.form-group
.col-
sm-offset-2.col-sm-10
.col-
md-offset-4.col-md-8
.row
.col-xs-6
%button
.btn.btn-success.js-submit-button
{
type:
"button"
,
"@click"
=>
"commit()"
,
":disabled"
=>
"!readyToCommit"
}
...
...
doc/user/project/merge_requests/resolve_conflicts.md
浏览文件 @
06a2e385
...
...
@@ -29,7 +29,7 @@ The merge conflict resolution editor allows for more complex merge conflicts,
which require the user to manually modify a file in order to resolve a conflict,
to be solved right form the GitLab interface. Use the
**Edit inline**
button
to open the editor. Once you're sure about your changes, hit the
**Commit
conflict resolution
**
button.
**Commit
to source branch
**
button.
![
Merge conflict editor
](
img/merge_conflict_editor.png
)
...
...
spec/features/merge_request/user_resolves_conflicts_spec.rb
浏览文件 @
06a2e385
...
...
@@ -27,7 +27,7 @@ describe 'Merge request > User resolves conflicts', :js do
end
end
find_button
(
'Commit
conflict resolution
'
).
send_keys
(
:return
)
find_button
(
'Commit
to source branch
'
).
send_keys
(
:return
)
expect
(
page
).
to
have_content
(
'All merge conflicts were resolved'
)
merge_request
.
reload_diff
...
...
@@ -71,7 +71,7 @@ describe 'Merge request > User resolves conflicts', :js do
execute_script
(
'ace.edit($(".files-wrapper .diff-file pre")[1]).setValue("Gregor Samsa woke from troubled dreams");'
)
end
find_button
(
'Commit
conflict resolution
'
).
send_keys
(
:return
)
find_button
(
'Commit
to source branch
'
).
send_keys
(
:return
)
expect
(
page
).
to
have_content
(
'All merge conflicts were resolved'
)
merge_request
.
reload_diff
...
...
@@ -145,7 +145,7 @@ describe 'Merge request > User resolves conflicts', :js do
execute_script
(
'ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("Gregor Samsa woke from troubled dreams");'
)
end
click_button
'Commit
conflict resolution
'
click_button
'Commit
to source branch
'
expect
(
page
).
to
have_content
(
'All merge conflicts were resolved'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录