Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
fc68a3ae
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 搜索 >>
提交
fc68a3ae
编写于
10月 17, 2017
作者:
W
Winnie Hellmann
提交者:
Annabel Dunstone Gray
10月 17, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change project deletion message from alert to notice
上级
75fb4af6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
2 deletion
+2
-2
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
spec/features/projects_spec.rb
spec/features/projects_spec.rb
+1
-1
未找到文件。
app/controllers/projects_controller.rb
浏览文件 @
fc68a3ae
...
...
@@ -125,7 +125,7 @@ class ProjectsController < Projects::ApplicationController
return
access_denied!
unless
can?
(
current_user
,
:remove_project
,
@project
)
::
Projects
::
DestroyService
.
new
(
@project
,
current_user
,
{}).
async_execute
flash
[
:
alert
]
=
_
(
"Project '%{project_name}' will be
deleted."
)
%
{
project_name:
@project
.
name_with_namespace
}
flash
[
:
notice
]
=
_
(
"Project '%{project_name}' is in the process of being
deleted."
)
%
{
project_name:
@project
.
name_with_namespace
}
redirect_to
dashboard_projects_path
,
status:
302
rescue
Projects
::
DestroyService
::
DestroyError
=>
ex
...
...
spec/features/projects_spec.rb
浏览文件 @
fc68a3ae
...
...
@@ -139,7 +139,7 @@ feature 'Project' do
it
'removes a project'
do
expect
{
remove_with_confirm
(
'Remove project'
,
project
.
path
)
}.
to
change
{
Project
.
count
}.
by
(
-
1
)
expect
(
page
).
to
have_content
"Project 'test / project1'
will be
deleted."
expect
(
page
).
to
have_content
"Project 'test / project1'
is in the process of being
deleted."
expect
(
Project
.
all
.
count
).
to
be_zero
expect
(
project
.
issues
).
to
be_empty
expect
(
project
.
merge_requests
).
to
be_empty
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录