Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
10b76acd
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,发现更多精彩内容 >>
提交
10b76acd
编写于
1月 21, 2019
作者:
K
Katrin Leinweber
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix typos
上级
fe4f8cad
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
4 deletion
+4
-4
doc/development/automatic_ce_ee_merge.md
doc/development/automatic_ce_ee_merge.md
+2
-2
spec/requests/api/submodules_spec.rb
spec/requests/api/submodules_spec.rb
+2
-2
未找到文件。
doc/development/automatic_ce_ee_merge.md
浏览文件 @
10b76acd
...
...
@@ -148,7 +148,7 @@ merge commit SHA is `138f5e2f20289bb376caffa0303adb0cac859ce1`:
-
To cherry-pick multiple commits, such as B and D in a range [A > B > C > D], use:
```shell
git cherry-pick comm
m
it-B-SHA commit-D-SHA
git cherry-pick commit-B-SHA commit-D-SHA
```
For example, suppose commit B SHA = `4f5e4018c09ed797fdf446b3752f82e46f5af502`,
...
...
@@ -213,7 +213,7 @@ being able to deploy.
No, not if there is an EE merge request for every CE merge request that causes
conflicts _and_ that EE merge request is merged first. In the past we may have
been a bit more relaxed when it comes to enforcing EE merge requests, but to
enable automatic merging have to start requiring such merge requests even for
enable automatic merging
we
have to start requiring such merge requests even for
the smallest conflicts.
### Some files I work with often conflict, how can I best deal with this?
...
...
spec/requests/api/submodules_spec.rb
浏览文件 @
10b76acd
...
...
@@ -64,7 +64,7 @@ describe API::Submodules do
expect
(
response
).
to
have_gitlab_http_status
(
400
)
end
it
'returns the comm
m
it'
do
it
'returns the commit'
do
head_commit
=
project
.
repository
.
commit
.
id
put
api
(
route
(
submodule
),
user
),
params:
params
...
...
@@ -81,7 +81,7 @@ describe API::Submodules do
let
(
:branch
)
{
'submodule_inside_folder'
}
let
(
:encoded_submodule
)
{
CGI
.
escape
(
submodule
)
}
it
'returns the comm
m
it'
do
it
'returns the commit'
do
expect
(
Submodules
::
UpdateService
)
.
to
receive
(
:new
)
.
with
(
any_args
,
hash_including
(
submodule:
submodule
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录