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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
16011886
Commit
16011886
authored
Feb 12, 2019
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move error check to pvt
parent
7a8a5fe5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
app/services/merge_requests/merge_base_service.rb
app/services/merge_requests/merge_base_service.rb
+6
-4
No files found.
app/services/merge_requests/merge_base_service.rb
View file @
16011886
...
...
@@ -8,10 +8,6 @@ module MergeRequests
attr_reader
:merge_request
# Overridden in EE.
def
error_check!
end
# Overridden in EE.
def
hooks_validation_pass?
(
_merge_request
)
true
...
...
@@ -19,6 +15,7 @@ module MergeRequests
# Overridden in EE.
def
hooks_validation_error
(
_merge_request
)
# No-op
end
def
source
...
...
@@ -31,6 +28,11 @@ module MergeRequests
private
# Overridden in EE.
def
error_check!
# No-op
end
def
raise_error
(
message
)
raise
MergeError
,
message
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