Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c48554ed
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,发现更多精彩内容 >>
提交
c48554ed
编写于
5月 15, 2017
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dturner/username' into 'master'
add username field to push webhook Closes #32136 See merge request !11272
上级
c6d53892
47b8516c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
0 deletion
+8
-0
changelogs/unreleased/dturner-username.yml
changelogs/unreleased/dturner-username.yml
+4
-0
doc/user/project/integrations/webhooks.md
doc/user/project/integrations/webhooks.md
+1
-0
lib/gitlab/data_builder/push.rb
lib/gitlab/data_builder/push.rb
+2
-0
spec/lib/gitlab/data_builder/push_spec.rb
spec/lib/gitlab/data_builder/push_spec.rb
+1
-0
未找到文件。
changelogs/unreleased/dturner-username.yml
0 → 100644
浏览文件 @
c48554ed
---
title
:
add username field to push webhook
merge_request
:
author
:
David Turner
doc/user/project/integrations/webhooks.md
浏览文件 @
c48554ed
...
@@ -74,6 +74,7 @@ X-Gitlab-Event: Push Hook
...
@@ -74,6 +74,7 @@ X-Gitlab-Event: Push Hook
"checkout_sha"
:
"da1560886d4f094c3e6c9ef40349f7d38b5d27d7"
,
"checkout_sha"
:
"da1560886d4f094c3e6c9ef40349f7d38b5d27d7"
,
"user_id"
:
4
,
"user_id"
:
4
,
"user_name"
:
"John Smith"
,
"user_name"
:
"John Smith"
,
"user_username"
:
"jsmith"
,
"user_email"
:
"john@example.com"
,
"user_email"
:
"john@example.com"
,
"user_avatar"
:
"https://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=8://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=80"
,
"user_avatar"
:
"https://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=8://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=80"
,
"project_id"
:
15
,
"project_id"
:
15
,
...
...
lib/gitlab/data_builder/push.rb
浏览文件 @
c48554ed
...
@@ -11,6 +11,7 @@ module Gitlab
...
@@ -11,6 +11,7 @@ module Gitlab
# ref: String,
# ref: String,
# user_id: String,
# user_id: String,
# user_name: String,
# user_name: String,
# user_username: String,
# user_email: String
# user_email: String
# project_id: String,
# project_id: String,
# repository: {
# repository: {
...
@@ -51,6 +52,7 @@ module Gitlab
...
@@ -51,6 +52,7 @@ module Gitlab
message:
message
,
message:
message
,
user_id:
user
.
id
,
user_id:
user
.
id
,
user_name:
user
.
name
,
user_name:
user
.
name
,
user_username:
user
.
username
,
user_email:
user
.
email
,
user_email:
user
.
email
,
user_avatar:
user
.
avatar_url
,
user_avatar:
user
.
avatar_url
,
project_id:
project
.
id
,
project_id:
project
.
id
,
...
...
spec/lib/gitlab/data_builder/push_spec.rb
浏览文件 @
c48554ed
...
@@ -35,6 +35,7 @@ describe Gitlab::DataBuilder::Push, lib: true do
...
@@ -35,6 +35,7 @@ describe Gitlab::DataBuilder::Push, lib: true do
it
{
expect
(
data
[
:ref
]).
to
eq
(
'refs/tags/v1.1.0'
)
}
it
{
expect
(
data
[
:ref
]).
to
eq
(
'refs/tags/v1.1.0'
)
}
it
{
expect
(
data
[
:user_id
]).
to
eq
(
user
.
id
)
}
it
{
expect
(
data
[
:user_id
]).
to
eq
(
user
.
id
)
}
it
{
expect
(
data
[
:user_name
]).
to
eq
(
user
.
name
)
}
it
{
expect
(
data
[
:user_name
]).
to
eq
(
user
.
name
)
}
it
{
expect
(
data
[
:user_username
]).
to
eq
(
user
.
username
)
}
it
{
expect
(
data
[
:user_email
]).
to
eq
(
user
.
email
)
}
it
{
expect
(
data
[
:user_email
]).
to
eq
(
user
.
email
)
}
it
{
expect
(
data
[
:user_avatar
]).
to
eq
(
user
.
avatar_url
)
}
it
{
expect
(
data
[
:user_avatar
]).
to
eq
(
user
.
avatar_url
)
}
it
{
expect
(
data
[
:project_id
]).
to
eq
(
project
.
id
)
}
it
{
expect
(
data
[
:project_id
]).
to
eq
(
project
.
id
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录