Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4e3e0dc8
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,发现更多精彩内容 >>
未验证
提交
4e3e0dc8
编写于
7月 27, 2017
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
DRY the branches API requirements definition
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
649382b1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
6 deletion
+11
-6
changelogs/unreleased/rc-fix-branches-api-endpoint.yml
changelogs/unreleased/rc-fix-branches-api-endpoint.yml
+1
-1
lib/api/api.rb
lib/api/api.rb
+3
-0
lib/api/branches.rb
lib/api/branches.rb
+7
-5
未找到文件。
changelogs/unreleased/rc-fix-branches-api-endpoint.yml
浏览文件 @
4e3e0dc8
---
title
:
Fix the /projects/:id/repository/branches endpoint to handle dots in the branch
name when the project full patch contains a `/`
merge_request
:
merge_request
:
13115
author
:
lib/api/api.rb
浏览文件 @
4e3e0dc8
...
...
@@ -86,6 +86,9 @@ module API
helpers
::
API
::
Helpers
helpers
::
API
::
Helpers
::
CommonHelpers
NO_SLASH_URL_PART_REGEX
=
%r{[^/]+}
PROJECT_ENDPOINT_REQUIREMENTS
=
{
id:
NO_SLASH_URL_PART_REGEX
}.
freeze
# Keep in alphabetical order
mount
::
API
::
AccessRequests
mount
::
API
::
AwardEmoji
...
...
lib/api/branches.rb
浏览文件 @
4e3e0dc8
...
...
@@ -4,12 +4,14 @@ module API
class
Branches
<
Grape
::
API
include
PaginationParams
BRANCH_ENDPOINT_REQUIREMENTS
=
API
::
PROJECT_ENDPOINT_REQUIREMENTS
.
merge
(
branch:
API
::
NO_SLASH_URL_PART_REGEX
)
before
{
authorize!
:download_code
,
user_project
}
params
do
requires
:id
,
type:
String
,
desc:
'The ID of a project'
end
resource
:projects
,
requirements:
{
id:
%r{[^/]+}
}
do
resource
:projects
,
requirements:
API
::
PROJECT_ENDPOINT_REQUIREMENTS
do
desc
'Get a project repository branches'
do
success
Entities
::
RepoBranch
end
...
...
@@ -28,7 +30,7 @@ module API
params
do
requires
:branch
,
type:
String
,
desc:
'The name of the branch'
end
get
':id/repository/branches/:branch'
,
requirements:
{
id:
%r{[^/]+}
,
branch:
%r{[^/]+}
}
do
get
':id/repository/branches/:branch'
,
requirements:
BRANCH_ENDPOINT_REQUIREMENTS
do
branch
=
user_project
.
repository
.
find_branch
(
params
[
:branch
])
not_found!
(
"Branch"
)
unless
branch
...
...
@@ -46,7 +48,7 @@ module API
optional
:developers_can_push
,
type:
Boolean
,
desc:
'Flag if developers can push to that branch'
optional
:developers_can_merge
,
type:
Boolean
,
desc:
'Flag if developers can merge to that branch'
end
put
':id/repository/branches/:branch/protect'
,
requirements:
{
id:
%r{[^/]+}
,
branch:
%r{[^/]+}
}
do
put
':id/repository/branches/:branch/protect'
,
requirements:
BRANCH_ENDPOINT_REQUIREMENTS
do
authorize_admin_project
branch
=
user_project
.
repository
.
find_branch
(
params
[
:branch
])
...
...
@@ -81,7 +83,7 @@ module API
params
do
requires
:branch
,
type:
String
,
desc:
'The name of the branch'
end
put
':id/repository/branches/:branch/unprotect'
,
requirements:
{
id:
%r{[^/]+}
,
branch:
%r{[^/]+}
}
do
put
':id/repository/branches/:branch/unprotect'
,
requirements:
BRANCH_ENDPOINT_REQUIREMENTS
do
authorize_admin_project
branch
=
user_project
.
repository
.
find_branch
(
params
[
:branch
])
...
...
@@ -118,7 +120,7 @@ module API
params
do
requires
:branch
,
type:
String
,
desc:
'The name of the branch'
end
delete
':id/repository/branches/:branch'
,
requirements:
{
id:
%r{[^/]+}
,
branch:
%r{[^/]+}
}
do
delete
':id/repository/branches/:branch'
,
requirements:
BRANCH_ENDPOINT_REQUIREMENTS
do
authorize_push_project
result
=
DeleteBranchService
.
new
(
user_project
,
current_user
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录