Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
29cb161e
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,发现更多精彩内容 >>
提交
29cb161e
编写于
9月 19, 2016
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Re-add the AccessRequestable concern
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
178e2758
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
55 addition
and
15 deletion
+55
-15
app/models/concerns/access_requestable.rb
app/models/concerns/access_requestable.rb
+13
-0
app/models/group.rb
app/models/group.rb
+1
-0
app/models/project.rb
app/models/project.rb
+1
-0
spec/models/concerns/access_requestable_spec.rb
spec/models/concerns/access_requestable_spec.rb
+40
-0
spec/models/group_spec.rb
spec/models/group_spec.rb
+0
-7
spec/models/project_spec.rb
spec/models/project_spec.rb
+0
-8
未找到文件。
app/models/concerns/access_requestable.rb
0 → 100644
浏览文件 @
29cb161e
# == AccessRequestable concern
#
# Contains functionality related to objects that can receive request for access.
#
# Used by Project, and Group.
#
module
AccessRequestable
extend
ActiveSupport
::
Concern
def
request_access
(
user
)
Members
::
RequestAccessService
.
new
(
self
,
user
).
execute
end
end
app/models/group.rb
浏览文件 @
29cb161e
...
...
@@ -3,6 +3,7 @@ require 'carrierwave/orm/activerecord'
class
Group
<
Namespace
include
Gitlab
::
ConfigHelper
include
Gitlab
::
VisibilityLevel
include
AccessRequestable
include
Referable
has_many
:group_members
,
->
{
where
(
requested_at:
nil
)
},
dependent: :destroy
,
as: :source
,
class_name:
'GroupMember'
...
...
app/models/project.rb
浏览文件 @
29cb161e
...
...
@@ -5,6 +5,7 @@ class Project < ActiveRecord::Base
include
Gitlab
::
ShellAdapter
include
Gitlab
::
VisibilityLevel
include
Gitlab
::
CurrentSettings
include
AccessRequestable
include
Referable
include
Sortable
include
AfterCommitQueue
...
...
spec/models/concerns/access_requestable_spec.rb
0 → 100644
浏览文件 @
29cb161e
require
'spec_helper'
describe
AccessRequestable
do
describe
'Group'
do
describe
'#request_access'
do
let
(
:group
)
{
create
(
:group
,
:public
)
}
let
(
:user
)
{
create
(
:user
)
}
it
{
expect
(
group
.
request_access
(
user
)).
to
be_a
(
GroupMember
)
}
it
{
expect
(
group
.
request_access
(
user
).
user
).
to
eq
(
user
)
}
end
describe
'#access_requested?'
do
let
(
:group
)
{
create
(
:group
,
:public
)
}
let
(
:user
)
{
create
(
:user
)
}
before
{
group
.
request_access
(
user
)
}
it
{
expect
(
group
.
requesters
.
exists?
(
user_id:
user
)).
to
be_truthy
}
end
end
describe
'Project'
do
describe
'#request_access'
do
let
(
:project
)
{
create
(
:empty_project
,
:public
)
}
let
(
:user
)
{
create
(
:user
)
}
it
{
expect
(
project
.
request_access
(
user
)).
to
be_a
(
ProjectMember
)
}
end
describe
'#access_requested?'
do
let
(
:project
)
{
create
(
:empty_project
,
:public
)
}
let
(
:user
)
{
create
(
:user
)
}
before
{
project
.
request_access
(
user
)
}
it
{
expect
(
project
.
requesters
.
exists?
(
user_id:
user
)).
to
be_truthy
}
end
end
end
spec/models/group_spec.rb
浏览文件 @
29cb161e
...
...
@@ -105,13 +105,6 @@ describe Group, models: true do
it
{
expect
(
group
.
human_name
).
to
eq
(
group
.
name
)
}
end
describe
'#request_access'
do
let
(
:user
)
{
create
(
:user
)
}
it
{
expect
(
group
.
request_access
(
user
)).
to
be_a
(
GroupMember
)
}
it
{
expect
(
group
.
request_access
(
user
).
user
).
to
eq
(
user
)
}
end
describe
'#add_user'
do
let
(
:user
)
{
create
(
:user
)
}
before
{
group
.
add_user
(
user
,
GroupMember
::
MASTER
)
}
...
...
spec/models/project_spec.rb
浏览文件 @
29cb161e
...
...
@@ -942,14 +942,6 @@ describe Project, models: true do
end
end
describe
'#request_access'
do
let
(
:project
)
{
create
(
:empty_project
,
:public
)
}
let
(
:user
)
{
create
(
:user
)
}
it
{
expect
(
project
.
request_access
(
user
)).
to
be_a
(
ProjectMember
)
}
it
{
expect
(
project
.
request_access
(
user
).
user
).
to
eq
(
user
)
}
end
describe
'.search'
do
let
(
:project
)
{
create
(
:project
,
description:
'kitten mittens'
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录