Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3c15f0ea
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,发现更多精彩内容 >>
提交
3c15f0ea
编写于
6月 02, 2017
作者:
M
Mark Fletcher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Accept a username for User-level Events API
上级
ad3e180e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
3 deletion
+12
-3
doc/api/events.md
doc/api/events.md
+1
-1
lib/api/events.rb
lib/api/events.rb
+2
-2
spec/requests/api/events_spec.rb
spec/requests/api/events_spec.rb
+9
-0
未找到文件。
doc/api/events.md
浏览文件 @
3c15f0ea
...
...
@@ -129,7 +129,7 @@ Parameters:
| Attribute | Type | Required | Description |
| --------- | ---- | -------- | ----------- |
|
`id`
| integer | yes | The ID of the user |
|
`id`
| integer | yes | The ID o
r Username o
f the user |
|
`action`
| string | no | Include only events of a particular
[
action type
][
action-types
]
|
|
`target_type`
| string | no | Include only events of a particular
[
target type
][
target-types
]
|
|
`before`
| date | no | Include only events created before a particular date. Please see
[
here for the supported format
][
date-formatting
]
|
...
...
lib/api/events.rb
浏览文件 @
3c15f0ea
...
...
@@ -42,7 +42,7 @@ module API
end
params
do
requires
:id
,
type:
Integer
,
desc:
'The ID
of the user'
requires
:id
,
type:
String
,
desc:
'The ID or Username
of the user'
end
resource
:users
do
desc
'Get the contribution events of a specified user'
do
...
...
@@ -55,7 +55,7 @@ module API
use
:sort_params
end
get
':id/events'
do
user
=
User
.
find_by
(
id:
params
[
:id
])
user
=
find_user
(
params
[
:id
])
not_found!
(
'User'
)
unless
user
events
=
EventsFinder
.
new
(
params
.
merge
(
source:
user
,
current_user:
current_user
)).
execute
.
preload
(
:author
,
:target
)
...
...
spec/requests/api/events_spec.rb
浏览文件 @
3c15f0ea
...
...
@@ -41,6 +41,15 @@ describe API::Events, api: true do
end
context
"as a user that can see the event's project"
do
it
'accepts a username'
do
get
api
(
"/users/
#{
user
.
username
}
/events"
,
user
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
include_pagination_headers
expect
(
json_response
).
to
be_an
Array
expect
(
json_response
.
size
).
to
eq
(
1
)
end
it
'returns the events'
do
get
api
(
"/users/
#{
user
.
id
}
/events"
,
user
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录