Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3128641f
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(gitcode.net)2024年7月9日维护升级公告
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
3128641f
编写于
11月 15, 2016
作者:
L
Lin Jen-Shin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Don't execute git hooks if you create branch as part of other change"
This reverts commit
a431ca0f
.
上级
f5bc41b3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
6 addition
and
10 deletion
+6
-10
app/models/repository.rb
app/models/repository.rb
+2
-6
app/services/commits/change_service.rb
app/services/commits/change_service.rb
+1
-1
app/services/create_branch_service.rb
app/services/create_branch_service.rb
+2
-2
app/services/files/base_service.rb
app/services/files/base_service.rb
+1
-1
未找到文件。
app/models/repository.rb
浏览文件 @
3128641f
...
...
@@ -162,18 +162,14 @@ class Repository
tags
.
find
{
|
tag
|
tag
.
name
==
name
}
end
def
add_branch
(
user
,
branch_name
,
target
,
with_hooks:
true
)
def
add_branch
(
user
,
branch_name
,
target
)
oldrev
=
Gitlab
::
Git
::
BLANK_SHA
ref
=
Gitlab
::
Git
::
BRANCH_REF_PREFIX
+
branch_name
target
=
commit
(
target
).
try
(
:id
)
return
false
unless
target
if
with_hooks
GitHooksService
.
new
.
execute
(
user
,
path_to_repo
,
oldrev
,
target
,
ref
)
do
update_ref!
(
ref
,
target
,
oldrev
)
end
else
GitHooksService
.
new
.
execute
(
user
,
path_to_repo
,
oldrev
,
target
,
ref
)
do
update_ref!
(
ref
,
target
,
oldrev
)
end
...
...
app/services/commits/change_service.rb
浏览文件 @
3128641f
...
...
@@ -55,7 +55,7 @@ module Commits
return
success
if
repository
.
find_branch
(
new_branch
)
result
=
CreateBranchService
.
new
(
@project
,
current_user
)
.
execute
(
new_branch
,
@target_branch
,
source_project:
@source_project
,
with_hooks:
false
)
.
execute
(
new_branch
,
@target_branch
,
source_project:
@source_project
)
if
result
[
:status
]
==
:error
raise
ChangeError
,
"There was an error creating the source branch:
#{
result
[
:message
]
}
"
...
...
app/services/create_branch_service.rb
浏览文件 @
3128641f
require_relative
'base_service'
class
CreateBranchService
<
BaseService
def
execute
(
branch_name
,
ref
,
source_project:
@project
,
with_hooks:
true
)
def
execute
(
branch_name
,
ref
,
source_project:
@project
)
valid_branch
=
Gitlab
::
GitRefValidator
.
validate
(
branch_name
)
unless
valid_branch
...
...
@@ -26,7 +26,7 @@ class CreateBranchService < BaseService
repository
.
find_branch
(
branch_name
)
else
repository
.
add_branch
(
current_user
,
branch_name
,
ref
,
with_hooks:
with_hooks
)
repository
.
add_branch
(
current_user
,
branch_name
,
ref
)
end
if
new_branch
...
...
app/services/files/base_service.rb
浏览文件 @
3128641f
...
...
@@ -74,7 +74,7 @@ module Files
end
def
create_target_branch
result
=
CreateBranchService
.
new
(
project
,
current_user
).
execute
(
@target_branch
,
@source_branch
,
source_project:
@source_project
,
with_hooks:
false
)
result
=
CreateBranchService
.
new
(
project
,
current_user
).
execute
(
@target_branch
,
@source_branch
,
source_project:
@source_project
)
unless
result
[
:status
]
==
:success
raise_error
(
"Something went wrong when we tried to create
#{
@target_branch
}
for you:
#{
result
[
:message
]
}
"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录