Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
projects.thm.de
GitLab
Commits
7a8a5fe5
Commit
7a8a5fe5
authored
Feb 12, 2019
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extend error checking to be overwritten in EE
parent
4e16edbe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
app/services/merge_requests/merge_base_service.rb
app/services/merge_requests/merge_base_service.rb
+4
-0
app/services/merge_requests/merge_service.rb
app/services/merge_requests/merge_service.rb
+2
-0
app/services/merge_requests/merge_to_ref_service.rb
app/services/merge_requests/merge_to_ref_service.rb
+2
-0
No files found.
app/services/merge_requests/merge_base_service.rb
View file @
7a8a5fe5
...
...
@@ -8,6 +8,10 @@ class MergeBaseService < MergeRequests::BaseService
attr_reader
:merge_request
# Overridden in EE.
def
error_check!
end
# Overridden in EE.
def
hooks_validation_pass?
(
_merge_request
)
true
...
...
app/services/merge_requests/merge_service.rb
View file @
7a8a5fe5
...
...
@@ -46,6 +46,8 @@ def authorization_check!
end
def
error_check!
super
error
=
if
@merge_request
.
should_be_rebased?
'Only fast-forward merge is allowed for your project. Please update your source branch'
...
...
app/services/merge_requests/merge_to_ref_service.rb
View file @
7a8a5fe5
...
...
@@ -33,6 +33,8 @@ def validate!
end
def
error_check!
super
error
=
if
Feature
.
disabled?
(
:merge_to_tmp_merge_ref_path
,
project
)
'Feature is not enabled'
...
...
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