Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
634a1527
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,发现更多精彩内容 >>
提交
634a1527
编写于
11月 06, 2017
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make sure group and project creation is blocked for new users that are external by default
上级
97b80fef
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
5 deletion
+14
-5
app/models/user.rb
app/models/user.rb
+4
-3
changelogs/unreleased/dm-block-group-and-project-creation-when-external-by-default.yml
...k-group-and-project-creation-when-external-by-default.yml
+6
-0
spec/models/user_spec.rb
spec/models/user_spec.rb
+4
-2
未找到文件。
app/models/user.rb
浏览文件 @
634a1527
...
...
@@ -164,7 +164,7 @@ class User < ActiveRecord::Base
before_validation
:set_notification_email
,
if: :email_changed?
before_validation
:set_public_email
,
if: :public_email_changed?
before_save
:ensure_incoming_email_token
before_save
:ensure_user_rights_and_limits
,
if:
:external_changed?
before_save
:ensure_user_rights_and_limits
,
if:
->
(
user
)
{
user
.
new_record?
||
user
.
external_changed?
}
before_save
:skip_reconfirmation!
,
if:
->
(
user
)
{
user
.
email_changed?
&&
user
.
read_only_attribute?
(
:email
)
}
before_save
:check_for_verified_email
,
if:
->
(
user
)
{
user
.
email_changed?
&&
!
user
.
new_record?
}
after_save
:ensure_namespace_correct
...
...
@@ -1139,8 +1139,9 @@ class User < ActiveRecord::Base
self
.
can_create_group
=
false
self
.
projects_limit
=
0
else
self
.
can_create_group
=
gitlab_config
.
default_can_create_group
self
.
projects_limit
=
current_application_settings
.
default_projects_limit
# Only revert these back to the default if they weren't specifically changed in this update.
self
.
can_create_group
=
gitlab_config
.
default_can_create_group
unless
can_create_group_changed?
self
.
projects_limit
=
current_application_settings
.
default_projects_limit
unless
projects_limit_changed?
end
end
...
...
changelogs/unreleased/dm-block-group-and-project-creation-when-external-by-default.yml
0 → 100644
浏览文件 @
634a1527
---
title
:
Make sure group and project creation is blocked for new users that are external
by default
merge_request
:
author
:
type
:
fixed
spec/models/user_spec.rb
浏览文件 @
634a1527
...
...
@@ -788,14 +788,16 @@ describe User do
end
it
"creates external user by default"
do
user
=
build
(
:user
)
user
=
create
(
:user
)
expect
(
user
.
external
).
to
be_truthy
expect
(
user
.
can_create_group
).
to
be_falsey
expect
(
user
.
projects_limit
).
to
be
0
end
describe
'with default overrides'
do
it
"creates a non-external user"
do
user
=
build
(
:user
,
external:
false
)
user
=
create
(
:user
,
external:
false
)
expect
(
user
.
external
).
to
be_falsey
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录