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
9df78bc4
Commit
9df78bc4
authored
Aug 25, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Follow renaming from CE
See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13739
parent
76115e2e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/services/merge_requests/ff_merge_service.rb
app/services/merge_requests/ff_merge_service.rb
+1
-1
app/services/projects/update_mirror_service.rb
app/services/projects/update_mirror_service.rb
+1
-1
spec/services/merge_requests/ff_merge_service_spec.rb
spec/services/merge_requests/ff_merge_service_spec.rb
+1
-1
No files found.
app/services/merge_requests/ff_merge_service.rb
View file @
9df78bc4
...
...
@@ -13,7 +13,7 @@ module MergeRequests
source
,
merge_request
.
target_branch
,
merge_request:
merge_request
)
rescue
GitHooksService
::
PreReceiveError
=>
e
rescue
Git
lab
::
Git
::
HooksService
::
PreReceiveError
=>
e
raise
MergeError
,
e
.
message
rescue
StandardError
=>
e
raise
MergeError
,
"Something went wrong during merge:
#{
e
.
message
}
"
...
...
app/services/projects/update_mirror_service.rb
View file @
9df78bc4
...
...
@@ -50,7 +50,7 @@ module Projects
else
begin
repository
.
ff_merge
(
current_user
,
upstream_branch
.
dereferenced_target
,
name
)
rescue
GitHooksService
::
PreReceiveError
,
Repository
::
CommitError
=>
e
rescue
Git
lab
::
Git
::
HooksService
::
PreReceiveError
,
Repository
::
CommitError
=>
e
errors
<<
e
.
message
end
end
...
...
spec/services/merge_requests/ff_merge_service_spec.rb
View file @
9df78bc4
...
...
@@ -71,7 +71,7 @@ describe MergeRequests::FfMergeService do
it
'logs and saves error if there is an PreReceiveError exception'
do
error_message
=
'error message'
allow
(
service
).
to
receive
(
:repository
).
and_raise
(
GitHooksService
::
PreReceiveError
,
error_message
)
allow
(
service
).
to
receive
(
:repository
).
and_raise
(
Git
lab
::
Git
::
HooksService
::
PreReceiveError
,
error_message
)
allow
(
service
).
to
receive
(
:execute_hooks
)
service
.
execute
(
merge_request
)
...
...
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