Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3c5c658a
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,发现更多精彩内容 >>
未验证
提交
3c5c658a
编写于
9月 17, 2018
作者:
N
Nick Thomas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use the correct email address when committing via a file service
上级
983bd38f
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
42 addition
and
3 deletion
+42
-3
app/services/files/base_service.rb
app/services/files/base_service.rb
+4
-2
spec/factories/users.rb
spec/factories/users.rb
+8
-0
spec/services/files/create_service_spec.rb
spec/services/files/create_service_spec.rb
+14
-1
spec/services/files/delete_service_spec.rb
spec/services/files/delete_service_spec.rb
+8
-0
spec/services/files/update_service_spec.rb
spec/services/files/update_service_spec.rb
+8
-0
未找到文件。
app/services/files/base_service.rb
浏览文件 @
3c5c658a
...
...
@@ -7,8 +7,10 @@ module Files
def
initialize
(
*
args
)
super
@author_email
=
params
[
:author_email
]
||
current_user
&
.
email
@author_name
=
params
[
:author_name
]
||
current_user
&
.
name
git_user
=
Gitlab
::
Git
::
User
.
from_gitlab
(
current_user
)
if
current_user
.
present?
@author_email
=
params
[
:author_email
]
||
git_user
&
.
email
@author_name
=
params
[
:author_name
]
||
git_user
&
.
name
@commit_message
=
params
[
:commit_message
]
@last_commit_sha
=
params
[
:last_commit_sha
]
...
...
spec/factories/users.rb
浏览文件 @
3c5c658a
...
...
@@ -58,6 +58,14 @@ FactoryBot.define do
project_view
:readme
end
trait
:commit_email
do
after
(
:create
)
do
|
user
,
evaluator
|
additional
=
create
(
:email
,
:confirmed
,
user:
user
,
email:
"commit-
#{
user
.
email
}
"
)
user
.
update!
(
commit_email:
additional
.
email
)
end
end
factory
:omniauth_user
do
transient
do
extern_uid
'123456'
...
...
spec/services/files/create_service_spec.rb
浏览文件 @
3c5c658a
...
...
@@ -3,7 +3,7 @@ require "spec_helper"
describe
Files
::
CreateService
do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:repository
)
{
project
.
repository
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
,
:commit_email
)
}
let
(
:file_content
)
{
'Test file content'
}
let
(
:branch_name
)
{
project
.
default_branch
}
let
(
:start_branch
)
{
branch_name
}
...
...
@@ -20,6 +20,8 @@ describe Files::CreateService do
}
end
let
(
:commit
)
{
repository
.
head_commit
}
subject
{
described_class
.
new
(
project
,
user
,
commit_params
)
}
before
do
...
...
@@ -75,4 +77,15 @@ describe Files::CreateService do
end
end
end
context
'commit attribute'
do
let
(
:file_path
)
{
'test-commit-attributes.txt'
}
it
'uses the commit email'
do
subject
.
execute
expect
(
commit
.
author_email
).
to
eq
(
user
.
commit_email
)
expect
(
commit
.
committer_email
).
to
eq
(
user
.
commit_email
)
end
end
end
spec/services/files/delete_service_spec.rb
浏览文件 @
3c5c658a
...
...
@@ -8,6 +8,7 @@ describe Files::DeleteService do
let
(
:file_path
)
{
'files/ruby/popen.rb'
}
let
(
:branch_name
)
{
project
.
default_branch
}
let
(
:last_commit_sha
)
{
nil
}
let
(
:commit
)
{
project
.
repository
.
head_commit
}
let
(
:commit_params
)
do
{
...
...
@@ -34,6 +35,13 @@ describe Files::DeleteService do
expect
(
blob
).
to
be_nil
end
it
'uses the commit email'
do
subject
.
execute
expect
(
commit
.
author_email
).
to
eq
(
user
.
commit_email
)
expect
(
commit
.
committer_email
).
to
eq
(
user
.
commit_email
)
end
end
before
do
...
...
spec/services/files/update_service_spec.rb
浏览文件 @
3c5c658a
...
...
@@ -9,6 +9,7 @@ describe Files::UpdateService do
let
(
:new_contents
)
{
'New Content'
}
let
(
:branch_name
)
{
project
.
default_branch
}
let
(
:last_commit_sha
)
{
nil
}
let
(
:commit
)
{
project
.
repository
.
commit
}
let
(
:commit_params
)
do
{
...
...
@@ -54,6 +55,13 @@ describe Files::UpdateService do
expect
(
results
.
data
).
to
eq
(
new_contents
)
end
it
'uses the commit email'
do
subject
.
execute
expect
(
commit
.
author_email
).
to
eq
(
user
.
commit_email
)
expect
(
commit
.
committer_email
).
to
eq
(
user
.
commit_email
)
end
end
context
"when the last_commit_sha is not supplied"
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录