Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c8614cbb
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,发现更多精彩内容 >>
未验证
提交
c8614cbb
编写于
8月 13, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Capture pre-receive exception
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
34690142
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
7 deletion
+19
-7
app/services/commit_service.rb
app/services/commit_service.rb
+18
-6
app/services/files/base_service.rb
app/services/files/base_service.rb
+1
-1
未找到文件。
app/services/commit_service.rb
浏览文件 @
c8614cbb
require
'securerandom'
class
CommitService
class
PreReceiveError
<
StandardError
;
end
class
CommitError
<
StandardError
;
end
def
self
.
transaction
(
project
,
current_user
,
ref
)
repository
=
project
.
repository
path_to_repo
=
repository
.
path_to_repo
empty_repo
=
repository
.
empty?
# Create temporary ref
random_string
=
SecureRandom
.
hex
tmp_ref
=
"refs/tmp/
#{
random_string
}
/head"
target
=
repository
.
find_branch
(
ref
).
target
repository
.
rugged
.
references
.
create
(
tmp_ref
,
target
)
unless
empty_repo
target
=
repository
.
find_branch
(
ref
).
target
repository
.
rugged
.
references
.
create
(
tmp_ref
,
target
)
end
# Make commit in tmp ref
sha
=
yield
(
tmp_ref
)
unless
sha
raise
'Failed to create commit'
raise
CommitError
.
new
(
'Failed to create commit'
)
end
# Run GitLab pre-receive hook
status
=
PreCommitService
.
new
(
project
,
current_user
).
execute
(
sha
,
ref
)
if
status
# Update head
repository
.
rugged
.
references
.
update
(
Gitlab
::
Git
::
BRANCH_REF_PREFIX
+
ref
,
sha
)
if
empty_repo
# Create branch
repository
.
rugged
.
references
.
create
(
Gitlab
::
Git
::
BRANCH_REF_PREFIX
+
ref
,
sha
)
else
# Update head
repository
.
rugged
.
references
.
update
(
Gitlab
::
Git
::
BRANCH_REF_PREFIX
+
ref
,
sha
)
end
# Run GitLab post receive hook
PostCommitService
.
new
(
project
,
current_user
).
execute
(
sha
,
ref
)
...
...
@@ -31,7 +43,7 @@ class CommitService
# Remove tmp ref and return error to user
repository
.
rugged
.
references
.
delete
(
tmp_ref
)
raise
'Commit was rejected by pre-reveive hook'
raise
PreReceiveError
.
new
(
'Commit was rejected by pre-reveive hook'
)
end
end
end
app/services/files/base_service.rb
浏览文件 @
c8614cbb
...
...
@@ -26,7 +26,7 @@ module Files
else
error
(
"Something went wrong. Your changes were not committed"
)
end
rescue
ValidationError
=>
ex
rescue
CommitService
::
CommitError
,
CommitService
::
PreReceiveError
,
ValidationError
=>
ex
error
(
ex
.
message
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录