Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a30f278b
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,发现更多精彩内容 >>
提交
a30f278b
编写于
1月 06, 2017
作者:
L
Lin Jen-Shin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix for initial commit and remove unneeded args
上级
ae86a1b9
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
18 addition
and
7 deletion
+18
-7
app/controllers/concerns/creates_commit.rb
app/controllers/concerns/creates_commit.rb
+9
-3
app/services/commits/change_service.rb
app/services/commits/change_service.rb
+9
-2
lib/api/commits.rb
lib/api/commits.rb
+0
-2
未找到文件。
app/controllers/concerns/creates_commit.rb
浏览文件 @
a30f278b
...
...
@@ -4,9 +4,10 @@ module CreatesCommit
def
create_commit
(
service
,
success_path
:,
failure_path
:,
failure_view:
nil
,
success_notice:
nil
)
set_commit_variables
source_branch
=
@mr_target_branch
unless
initial_commit?
commit_params
=
@commit_params
.
merge
(
source_project:
@mr_target_project
,
source_branch:
@mr_target
_branch
,
source_branch:
source
_branch
,
target_branch:
@mr_source_branch
)
...
...
@@ -113,7 +114,7 @@ module CreatesCommit
else
# Merge request to this project
@mr_target_project
=
@project
@mr_target_branch
||=
@ref
@mr_target_branch
=
@ref
||
@target_branch
end
else
# Edit file in fork
...
...
@@ -121,7 +122,12 @@ module CreatesCommit
# Merge request from fork to this project
@mr_source_project
=
@tree_edit_project
@mr_target_project
=
@project
@mr_target_branch
||=
@ref
@mr_target_branch
=
@ref
||
@target_branch
end
end
def
initial_commit?
@mr_target_branch
.
nil?
||
!
@mr_target_project
.
repository
.
branch_exists?
(
@mr_target_branch
)
end
end
app/services/commits/change_service.rb
浏览文件 @
a30f278b
...
...
@@ -26,8 +26,15 @@ module Commits
def
commit_change
(
action
)
raise
NotImplementedError
unless
repository
.
respond_to?
(
action
)
into
=
@create_merge_request
?
@commit
.
public_send
(
"
#{
action
}
_branch_name"
)
:
@target_branch
tree_id
=
repository
.
public_send
(
"check_
#{
action
}
_content"
,
@commit
,
@target_branch
)
if
@create_merge_request
into
=
@commit
.
public_send
(
"
#{
action
}
_branch_name"
)
tree_branch
=
@source_branch
else
into
=
tree_branch
=
@target_branch
end
tree_id
=
repository
.
public_send
(
"check_
#{
action
}
_content"
,
@commit
,
tree_branch
)
if
tree_id
validate_target_branch
(
into
)
if
@create_merge_request
...
...
lib/api/commits.rb
浏览文件 @
a30f278b
...
...
@@ -140,8 +140,6 @@ module API
commit_params
=
{
commit:
commit
,
create_merge_request:
false
,
source_project:
user_project
,
source_branch:
commit
.
cherry_pick_branch_name
,
target_branch:
params
[
:branch
]
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录