Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3457695b
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,发现更多精彩内容 >>
提交
3457695b
编写于
6月 24, 2019
作者:
S
Sam Battalio
提交者:
Nick Thomas
6月 24, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change HTTP Status Code when repository disabled
上级
9e6c3f56
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
29 addition
and
14 deletion
+29
-14
changelogs/unreleased/50834-change-http-status-code-when-repository-disabled.yml
...0834-change-http-status-code-when-repository-disabled.yml
+5
-0
lib/api/branches.rb
lib/api/branches.rb
+4
-1
lib/api/commits.rb
lib/api/commits.rb
+4
-1
lib/api/helpers.rb
lib/api/helpers.rb
+4
-0
spec/requests/api/branches_spec.rb
spec/requests/api/branches_spec.rb
+5
-5
spec/requests/api/commits_spec.rb
spec/requests/api/commits_spec.rb
+7
-7
未找到文件。
changelogs/unreleased/50834-change-http-status-code-when-repository-disabled.yml
0 → 100644
浏览文件 @
3457695b
---
title
:
"
Changed
HTTP
Status
Code
for
disabled
repository
on
/branches
and
/commits
to
404"
merge_request
:
29585
author
:
Sam Battalio
type
:
changed
lib/api/branches.rb
浏览文件 @
3457695b
...
...
@@ -8,7 +8,10 @@ module API
BRANCH_ENDPOINT_REQUIREMENTS
=
API
::
NAMESPACE_OR_PROJECT_REQUIREMENTS
.
merge
(
branch:
API
::
NO_SLASH_URL_PART_REGEX
)
before
{
authorize!
:download_code
,
user_project
}
before
do
require_repository_enabled!
authorize!
:download_code
,
user_project
end
helpers
do
params
:filter_params
do
...
...
lib/api/commits.rb
浏览文件 @
3457695b
...
...
@@ -6,7 +6,10 @@ module API
class
Commits
<
Grape
::
API
include
PaginationParams
before
{
authorize!
:download_code
,
user_project
}
before
do
require_repository_enabled!
authorize!
:download_code
,
user_project
end
helpers
do
def
user_access
...
...
lib/api/helpers.rb
浏览文件 @
3457695b
...
...
@@ -250,6 +250,10 @@ module API
authorize!
:update_build
,
user_project
end
def
require_repository_enabled!
(
subject
=
:global
)
not_found!
(
"Repository"
)
unless
user_project
.
feature_available?
(
:repository
,
current_user
)
end
def
require_gitlab_workhorse!
unless
env
[
'HTTP_GITLAB_WORKHORSE'
].
present?
forbidden!
(
'Request should be executed via GitLab Workhorse'
)
...
...
spec/requests/api/branches_spec.rb
浏览文件 @
3457695b
...
...
@@ -65,7 +65,7 @@ describe API::Branches do
context
'when repository is disabled'
do
include_context
'disabled repository'
it_behaves_like
'40
3
response'
do
it_behaves_like
'40
4
response'
do
let
(
:request
)
{
get
api
(
route
,
current_user
)
}
end
end
...
...
@@ -175,7 +175,7 @@ describe API::Branches do
context
'when repository is disabled'
do
include_context
'disabled repository'
it_behaves_like
'40
3
response'
do
it_behaves_like
'40
4
response'
do
let
(
:request
)
{
get
api
(
route
,
current_user
)
}
end
end
...
...
@@ -337,7 +337,7 @@ describe API::Branches do
context
'when repository is disabled'
do
include_context
'disabled repository'
it_behaves_like
'40
3
response'
do
it_behaves_like
'40
4
response'
do
let
(
:request
)
{
put
api
(
route
,
current_user
)
}
end
end
...
...
@@ -471,7 +471,7 @@ describe API::Branches do
context
'when repository is disabled'
do
include_context
'disabled repository'
it_behaves_like
'40
3
response'
do
it_behaves_like
'40
4
response'
do
let
(
:request
)
{
put
api
(
route
,
current_user
)
}
end
end
...
...
@@ -547,7 +547,7 @@ describe API::Branches do
context
'when repository is disabled'
do
include_context
'disabled repository'
it_behaves_like
'40
3
response'
do
it_behaves_like
'40
4
response'
do
let
(
:request
)
{
post
api
(
route
,
current_user
)
}
end
end
...
...
spec/requests/api/commits_spec.rb
浏览文件 @
3457695b
...
...
@@ -736,7 +736,7 @@ describe API::Commits do
context
'when repository is disabled'
do
include_context
'disabled repository'
it_behaves_like
'40
3
response'
do
it_behaves_like
'40
4
response'
do
let
(
:request
)
{
get
api
(
route
,
current_user
)
}
end
end
...
...
@@ -825,7 +825,7 @@ describe API::Commits do
context
'when repository is disabled'
do
include_context
'disabled repository'
it_behaves_like
'40
3
response'
do
it_behaves_like
'40
4
response'
do
let
(
:request
)
{
get
api
(
route
,
current_user
)
}
end
end
...
...
@@ -968,7 +968,7 @@ describe API::Commits do
context
'when repository is disabled'
do
include_context
'disabled repository'
it_behaves_like
'40
3
response'
do
it_behaves_like
'40
4
response'
do
let
(
:request
)
{
get
api
(
route
,
current_user
)
}
end
end
...
...
@@ -1067,7 +1067,7 @@ describe API::Commits do
context
'when repository is disabled'
do
include_context
'disabled repository'
it_behaves_like
'40
3
response'
do
it_behaves_like
'40
4
response'
do
let
(
:request
)
{
get
api
(
route
,
current_user
)
}
end
end
...
...
@@ -1169,7 +1169,7 @@ describe API::Commits do
context
'when repository is disabled'
do
include_context
'disabled repository'
it_behaves_like
'40
3
response'
do
it_behaves_like
'40
4
response'
do
let
(
:request
)
{
post
api
(
route
,
current_user
),
params:
{
branch:
'master'
}
}
end
end
...
...
@@ -1324,7 +1324,7 @@ describe API::Commits do
context
'when repository is disabled'
do
include_context
'disabled repository'
it_behaves_like
'40
3
response'
do
it_behaves_like
'40
4
response'
do
let
(
:request
)
{
post
api
(
route
,
current_user
),
params:
{
branch:
branch
}
}
end
end
...
...
@@ -1435,7 +1435,7 @@ describe API::Commits do
context
'when repository is disabled'
do
include_context
'disabled repository'
it_behaves_like
'40
3
response'
do
it_behaves_like
'40
4
response'
do
let
(
:request
)
{
post
api
(
route
,
current_user
),
params:
{
note:
'My comment'
}
}
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录