Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2b5b8c15
Commit
2b5b8c15
authored
Mar 02, 2017
by
Jarka Kadlecova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rebase - fix commiter email & name
parent
21751f01
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
1 deletion
+15
-1
app/services/merge_requests/rebase_service.rb
app/services/merge_requests/rebase_service.rb
+2
-1
changelogs/unreleased-ee/818-rebase-commiter.yml
changelogs/unreleased-ee/818-rebase-commiter.yml
+4
-0
spec/services/merge_requests/rebase_service_spec.rb
spec/services/merge_requests/rebase_service_spec.rb
+9
-0
No files found.
app/services/merge_requests/rebase_service.rb
View file @
2b5b8c15
...
...
@@ -26,7 +26,8 @@ module MergeRequests
run_git_command
(
%W(pull --rebase
#{
target_project
.
repository
.
path_to_repo
}
#{
merge_request
.
target_branch
}
)
,
tree_path
,
git_env
,
git_env
.
merge
(
'GIT_COMMITTER_NAME'
=>
current_user
.
name
,
'GIT_COMMITTER_EMAIL'
=>
current_user
.
email
),
'rebase branch'
)
...
...
changelogs/unreleased-ee/818-rebase-commiter.yml
0 → 100644
View file @
2b5b8c15
---
title
:
Rebase - fix commiter email & name
merge_request
:
author
:
spec/services/merge_requests/rebase_service_spec.rb
View file @
2b5b8c15
...
...
@@ -31,6 +31,15 @@ describe MergeRequests::RebaseService do
head_sha
=
merge_request
.
source_project
.
repository
.
commit
(
merge_request
.
source_branch
).
sha
expect
(
merge_request
.
reload
.
rebase_commit_sha
).
to
eq
(
head_sha
)
end
it
'logs correct author and commiter'
do
head_commit
=
merge_request
.
source_project
.
repository
.
commit
(
merge_request
.
source_branch
)
expect
(
head_commit
.
author_email
).
to
eq
(
'dmitriy.zaporozhets@gmail.com'
)
expect
(
head_commit
.
author_name
).
to
eq
(
'Dmitriy Zaporozhets'
)
expect
(
head_commit
.
committer_email
).
to
eq
(
user
.
email
)
expect
(
head_commit
.
committer_name
).
to
eq
(
user
.
name
)
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment