Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5fb436aa
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 搜索 >>
提交
5fb436aa
编写于
7月 20, 2016
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix a few nitpicks
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
4d69cb9d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
9 addition
and
20 deletion
+9
-20
app/models/ability.rb
app/models/ability.rb
+2
-2
doc/workflow/add-user/add-user.md
doc/workflow/add-user/add-user.md
+2
-2
doc/workflow/groups.md
doc/workflow/groups.md
+2
-2
spec/features/groups/members/user_requests_access_spec.rb
spec/features/groups/members/user_requests_access_spec.rb
+1
-10
spec/features/projects/members/user_requests_access_spec.rb
spec/features/projects/members/user_requests_access_spec.rb
+2
-4
未找到文件。
app/models/ability.rb
浏览文件 @
5fb436aa
...
...
@@ -372,8 +372,8 @@ class Ability
]
end
if
(
group
.
public?
||
(
group
.
internal?
&&
!
user
.
external?
))
&&
group
.
request_access_enabled
rules
<<
:request_access
unless
group
.
users
.
in
clude?
(
user
)
if
group
.
public?
||
(
group
.
internal?
&&
!
user
.
external?
)
rules
<<
:request_access
if
group
.
request_access_enabled
&&
group
.
users
.
ex
clude?
(
user
)
end
rules
.
flatten
...
...
doc/workflow/add-user/add-user.md
浏览文件 @
5fb436aa
...
...
@@ -90,8 +90,8 @@ GitLab account using the same e-mail address the invitation was sent to.
## Request access to a project
As project owner you can enable or disable non members to request access to
your project. Go to
project settings and click on
**allow users to request access**
As
a
project owner you can enable or disable non members to request access to
your project. Go to
the project settings and click on
**Allow users to request access**
.
As a user, you can request to be a member of a project. Go to the project you'd
like to be a member of, and click the
**Request Access**
button on the right
...
...
doc/workflow/groups.md
浏览文件 @
5fb436aa
...
...
@@ -53,8 +53,8 @@ If necessary, you can increase the access level of an individual user for a spec
## Requesting access to a group
As group owner you can enable or disable non members to request access to
your group. Go to
group settings and click on
**allow users to request access**
As
a
group owner you can enable or disable non members to request access to
your group. Go to
the group settings and click on
**Allow users to request access**
.
As a user, you can request to be a member of a group. Go to the group you'd
like to be a member of, and click the
**Request Access**
button on the right
...
...
spec/features/groups/members/user_requests_access_spec.rb
浏览文件 @
5fb436aa
...
...
@@ -9,19 +9,17 @@ feature 'Groups > Members > User requests access', feature: true do
background
do
group
.
add_owner
(
owner
)
login_as
(
user
)
visit
group_path
(
group
)
end
scenario
'request access feature is disabled'
do
group
.
update_attributes
(
request_access_enabled:
false
)
visit
group_path
(
group
)
visit
group_path
(
group
)
expect
(
page
).
not_to
have_content
'Request Access'
end
scenario
'user can request access to a group'
do
visit
group_path
(
group
)
perform_enqueued_jobs
{
click_link
'Request Access'
}
expect
(
ActionMailer
::
Base
.
deliveries
.
last
.
to
).
to
eq
[
owner
.
notification_email
]
...
...
@@ -35,15 +33,12 @@ feature 'Groups > Members > User requests access', feature: true do
end
scenario
'user does not see private projects'
do
visit
group_path
(
group
)
perform_enqueued_jobs
{
click_link
'Request Access'
}
expect
(
page
).
not_to
have_content
project
.
name
end
scenario
'user does not see group in the Dashboard > Groups page'
do
visit
group_path
(
group
)
perform_enqueued_jobs
{
click_link
'Request Access'
}
visit
dashboard_groups_path
...
...
@@ -52,8 +47,6 @@ feature 'Groups > Members > User requests access', feature: true do
end
scenario
'user is not listed in the group members page'
do
visit
group_path
(
group
)
click_link
'Request Access'
expect
(
group
.
requesters
.
exists?
(
user_id:
user
)).
to
be_truthy
...
...
@@ -66,8 +59,6 @@ feature 'Groups > Members > User requests access', feature: true do
end
scenario
'user can withdraw its request for access'
do
visit
group_path
(
group
)
click_link
'Request Access'
expect
(
group
.
requesters
.
exists?
(
user_id:
user
)).
to
be_truthy
...
...
spec/features/projects/members/user_requests_access_spec.rb
浏览文件 @
5fb436aa
...
...
@@ -8,17 +8,17 @@ feature 'Projects > Members > User requests access', feature: true do
background
do
project
.
team
<<
[
master
,
:master
]
login_as
(
user
)
visit
namespace_project_path
(
project
.
namespace
,
project
)
end
scenario
'request access feature is disabled'
do
project
.
update_attributes
(
request_access_enabled:
false
)
visit
namespace_project_path
(
project
.
namespace
,
project
)
expect
(
page
).
not_to
have_content
'Request Access'
end
scenario
'user can request access to a project'
do
visit
namespace_project_path
(
project
.
namespace
,
project
)
perform_enqueued_jobs
{
click_link
'Request Access'
}
expect
(
ActionMailer
::
Base
.
deliveries
.
last
.
to
).
to
eq
[
master
.
notification_email
]
...
...
@@ -32,7 +32,6 @@ feature 'Projects > Members > User requests access', feature: true do
end
scenario
'user is not listed in the project members page'
do
visit
namespace_project_path
(
project
.
namespace
,
project
)
click_link
'Request Access'
expect
(
project
.
requesters
.
exists?
(
user_id:
user
)).
to
be_truthy
...
...
@@ -47,7 +46,6 @@ feature 'Projects > Members > User requests access', feature: true do
end
scenario
'user can withdraw its request for access'
do
visit
namespace_project_path
(
project
.
namespace
,
project
)
click_link
'Request Access'
expect
(
project
.
requesters
.
exists?
(
user_id:
user
)).
to
be_truthy
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录