Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
924e4b37
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,体验更适合开发者的 AI 搜索 >>
提交
924e4b37
编写于
4月 06, 2016
作者:
S
Stan Hu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Return status code 303 after a branch DELETE operation to avoid project deletion
Closes #14994
上级
8f094531
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
19 addition
and
2 deletion
+19
-2
CHANGELOG
CHANGELOG
+1
-0
app/controllers/projects/application_controller.rb
app/controllers/projects/application_controller.rb
+3
-1
app/controllers/projects/branches_controller.rb
app/controllers/projects/branches_controller.rb
+1
-1
spec/controllers/projects/branches_controller_spec.rb
spec/controllers/projects/branches_controller_spec.rb
+14
-0
未找到文件。
CHANGELOG
浏览文件 @
924e4b37
...
...
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.7.0 (unreleased)
- All images in discussions and wikis now link to their source files !3464 (Connor Shea).
- Return status code 303 after a branch DELETE operation to avoid project deletion (Stan Hu)
- Improved Markdown rendering performance !3389 (Yorick Peterse)
- Don't attempt to look up an avatar in repo if repo directory does not exist (Stan Hu)
- Preserve time notes/comments have been updated at when moving issue
...
...
app/controllers/projects/application_controller.rb
浏览文件 @
924e4b37
...
...
@@ -68,7 +68,9 @@ class Projects::ApplicationController < ApplicationController
end
def
require_non_empty_project
redirect_to
namespace_project_path
(
@project
.
namespace
,
@project
)
if
@project
.
empty_repo?
# Be sure to return status code 303 to avoid a double DELETE:
# http://api.rubyonrails.org/classes/ActionController/Redirecting.html
redirect_to
namespace_project_path
(
@project
.
namespace
,
@project
),
status:
303
if
@project
.
empty_repo?
end
def
require_branch_head
...
...
app/controllers/projects/branches_controller.rb
浏览文件 @
924e4b37
...
...
@@ -48,7 +48,7 @@ class Projects::BranchesController < Projects::ApplicationController
respond_to
do
|
format
|
format
.
html
do
redirect_to
namespace_project_branches_path
(
@project
.
namespace
,
@project
)
@project
)
,
status:
303
end
format
.
js
{
render
status:
status
[
:return_code
]
}
end
...
...
spec/controllers/projects/branches_controller_spec.rb
浏览文件 @
924e4b37
...
...
@@ -93,6 +93,20 @@ describe Projects::BranchesController do
end
end
describe
"POST destroy with HTML format"
do
render_views
it
'returns 303'
do
post
:destroy
,
format: :html
,
id:
'foo/bar/baz'
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
expect
(
response
.
status
).
to
eq
(
303
)
end
end
describe
"POST destroy"
do
render_views
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录