Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8077a5f9
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 搜索 >>
提交
8077a5f9
编写于
3月 12, 2016
作者:
Z
Zeger-Jan van de Weg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clearify who deletes the user
上级
a09323c9
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
10 addition
and
9 deletion
+10
-9
CHANGELOG
CHANGELOG
+1
-1
app/controllers/admin/abuse_reports_controller.rb
app/controllers/admin/abuse_reports_controller.rb
+1
-1
app/models/abuse_report.rb
app/models/abuse_report.rb
+2
-2
app/services/delete_user_service.rb
app/services/delete_user_service.rb
+1
-1
spec/models/abuse_report_spec.rb
spec/models/abuse_report_spec.rb
+4
-3
spec/workers/delete_user_worker_spec.rb
spec/workers/delete_user_worker_spec.rb
+1
-1
未找到文件。
CHANGELOG
浏览文件 @
8077a5f9
...
...
@@ -39,6 +39,7 @@ v 8.6.0 (unreleased)
- Add ability to show archived projects on dashboard, explore and group pages
- Move group activity to separate page
- Continue parameters are checked to ensure redirection goes to the same instance
- User deletion is now done in the background so the request can not time out
v 8.5.6
- Obtain a lease before querying LDAP
...
...
@@ -60,7 +61,6 @@ v 8.5.3
- Show commit message in JIRA mention comment
- Makes issue page and merge request page usable on mobile browsers.
- Improved UI for profile settings
- User deletion is now done in the background so the request can not time out
v 8.5.2
- Fix sidebar overlapping content when screen width was below 1200px
...
...
app/controllers/admin/abuse_reports_controller.rb
浏览文件 @
8077a5f9
...
...
@@ -6,7 +6,7 @@ class Admin::AbuseReportsController < Admin::ApplicationController
def
destroy
abuse_report
=
AbuseReport
.
find
(
params
[
:id
])
abuse_report
.
remove_user
(
current_user
)
if
params
[
:remove_user
]
abuse_report
.
remove_user
(
deleted_by:
current_user
)
if
params
[
:remove_user
]
abuse_report
.
destroy
render
nothing:
true
...
...
app/models/abuse_report.rb
浏览文件 @
8077a5f9
...
...
@@ -19,9 +19,9 @@ class AbuseReport < ActiveRecord::Base
validates
:message
,
presence:
true
validates
:user_id
,
uniqueness:
{
message:
'has already been reported'
}
def
remove_user
(
current_user
)
def
remove_user
(
deleted_by
:
)
user
.
block
DeleteUserWorker
.
perform_async
(
current_user
.
id
,
user
.
id
,
force
:
true
)
DeleteUserWorker
.
perform_async
(
deleted_by
.
id
,
user
.
id
,
delete_solo_owned_groups
:
true
)
end
def
notify
...
...
app/services/delete_user_service.rb
浏览文件 @
8077a5f9
...
...
@@ -6,7 +6,7 @@ class DeleteUserService
end
def
execute
(
user
,
options
=
{})
if
!
options
[
:
force
]
&&
user
.
solo_owned_groups
.
present?
if
!
options
[
:
delete_solo_owned_groups
]
&&
user
.
solo_owned_groups
.
present?
user
.
errors
[
:base
]
<<
'You must transfer ownership or delete groups before you can remove user'
return
user
end
...
...
spec/models/abuse_report_spec.rb
浏览文件 @
8077a5f9
...
...
@@ -32,13 +32,14 @@ RSpec.describe AbuseReport, type: :model do
describe
'#remove_user'
do
it
'blocks the user'
do
expect
{
subject
.
remove_user
(
user
)
}.
to
change
{
subject
.
user
.
blocked?
}.
to
(
true
)
expect
{
subject
.
remove_user
(
deleted_by:
user
)
}.
to
change
{
subject
.
user
.
blocked?
}.
to
(
true
)
end
it
'lets a worker delete the user'
do
expect
(
DeleteUserWorker
).
to
receive
(
:perform_async
).
with
(
user
.
id
,
subject
.
user
.
id
,
force:
true
)
expect
(
DeleteUserWorker
).
to
receive
(
:perform_async
).
with
(
user
.
id
,
subject
.
user
.
id
,
delete_solo_owned_groups:
true
)
subject
.
remove_user
(
user
)
subject
.
remove_user
(
deleted_by:
user
)
end
end
...
...
spec/workers/delete_user_worker_spec.rb
浏览文件 @
8077a5f9
...
...
@@ -43,7 +43,7 @@ describe DeleteUserWorker do
before
do
solo_owned
.
group_members
=
[
member
]
DeleteUserWorker
.
new
.
perform
(
current_user
.
id
,
user
.
id
,
"
force
"
=>
true
)
DeleteUserWorker
.
new
.
perform
(
current_user
.
id
,
user
.
id
,
"
delete_solo_owned_groups
"
=>
true
)
end
it
'deletes solo owned groups'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录