Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
fb5ded7d
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,发现更多精彩内容 >>
提交
fb5ded7d
编写于
1月 09, 2017
作者:
S
Sean McGivern
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix-broken-url-on-group-avatar' into 'master'
Fix broken url on group avatar Closes #26452 See merge request !8464
上级
8ab94120
c1d23541
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
37 addition
and
1 deletion
+37
-1
app/services/projects/participants_service.rb
app/services/projects/participants_service.rb
+1
-1
changelogs/unreleased/fix-broken-url-on-group-avatar.yml
changelogs/unreleased/fix-broken-url-on-group-avatar.yml
+4
-0
spec/services/projects/participants_service_spec.rb
spec/services/projects/participants_service_spec.rb
+32
-0
未找到文件。
app/services/projects/participants_service.rb
浏览文件 @
fb5ded7d
...
...
@@ -36,7 +36,7 @@ module Projects
def
groups
current_user
.
authorized_groups
.
sort_by
(
&
:path
).
map
do
|
group
|
count
=
group
.
users
.
count
{
username:
group
.
path
,
name:
group
.
name
,
count:
count
,
avatar_url:
group
.
avatar
.
url
}
{
username:
group
.
path
,
name:
group
.
name
,
count:
count
,
avatar_url:
group
.
avatar
_
url
}
end
end
...
...
changelogs/unreleased/fix-broken-url-on-group-avatar.yml
0 → 100644
浏览文件 @
fb5ded7d
---
title
:
Fix broken url on group avatar
merge_request
:
8464
author
:
hogewest
spec/services/projects/participants_service_spec.rb
0 → 100644
浏览文件 @
fb5ded7d
require
'spec_helper'
describe
Projects
::
ParticipantsService
,
services:
true
do
describe
'#groups'
do
describe
'avatar_url'
do
let
(
:project
)
{
create
(
:empty_project
,
:public
)
}
let
(
:group
)
{
create
(
:group
,
avatar:
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/dk.png'
))
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:base_url
)
{
Settings
.
send
(
:build_base_gitlab_url
)
}
let!
(
:group_member
)
{
create
(
:group_member
,
group:
group
,
user:
user
)
}
it
'should return an url for the avatar'
do
participants
=
described_class
.
new
(
project
,
user
)
groups
=
participants
.
groups
expect
(
groups
.
size
).
to
eq
1
expect
(
groups
.
first
[
:avatar_url
]).
to
eq
"
#{
base_url
}
/uploads/group/avatar/
#{
group
.
id
}
/dk.png"
end
it
'should return an url for the avatar with relative url'
do
stub_config_setting
(
relative_url_root:
'/gitlab'
)
stub_config_setting
(
url:
Settings
.
send
(
:build_gitlab_url
))
participants
=
described_class
.
new
(
project
,
user
)
groups
=
participants
.
groups
expect
(
groups
.
size
).
to
eq
1
expect
(
groups
.
first
[
:avatar_url
]).
to
eq
"
#{
base_url
}
/gitlab/uploads/group/avatar/
#{
group
.
id
}
/dk.png"
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录