Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
22d53f06
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,发现更多精彩内容 >>
提交
22d53f06
编写于
7月 25, 2017
作者:
T
Tiago Botelho
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes 500 error caused by pending delete projects in admin dashboard
上级
ea6dfcad
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
1 deletion
+26
-1
app/controllers/admin/dashboard_controller.rb
app/controllers/admin/dashboard_controller.rb
+1
-1
changelogs/unreleased/35453-pending-delete-projects-error-in-admin-dashboard-fix.yml
...-pending-delete-projects-error-in-admin-dashboard-fix.yml
+4
-0
spec/controllers/admin/dashboard_controller_spec.rb
spec/controllers/admin/dashboard_controller_spec.rb
+21
-0
未找到文件。
app/controllers/admin/dashboard_controller.rb
浏览文件 @
22d53f06
class
Admin::DashboardController
<
Admin
::
ApplicationController
def
index
@projects
=
Project
.
with_route
.
limit
(
10
)
@projects
=
Project
.
with
out_deleted
.
with
_route
.
limit
(
10
)
@users
=
User
.
limit
(
10
)
@groups
=
Group
.
with_route
.
limit
(
10
)
end
...
...
changelogs/unreleased/35453-pending-delete-projects-error-in-admin-dashboard-fix.yml
0 → 100644
浏览文件 @
22d53f06
---
title
:
Fixes 500 error caused by pending delete projects in admin dashboard
merge_request
:
13067
author
:
spec/controllers/admin/dashboard_controller_spec.rb
0 → 100644
浏览文件 @
22d53f06
require
'spec_helper'
describe
Admin
::
DashboardController
do
describe
'#index'
do
context
'with pending_delete projects'
do
render_views
it
'does not retrieve projects that are pending deletion'
do
sign_in
(
create
(
:admin
))
project
=
create
(
:project
)
pending_delete_project
=
create
(
:project
,
pending_delete:
true
)
get
:index
expect
(
response
.
body
).
to
match
(
project
.
name
)
expect
(
response
.
body
).
not_to
match
(
pending_delete_project
.
name
)
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录