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
876ca63f
Commit
876ca63f
authored
Apr 08, 2016
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Validate with Git Hooks before accepting a merge request
parent
04bc1346
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
0 deletions
+22
-0
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+6
-0
app/services/merge_requests/merge_service.rb
app/services/merge_requests/merge_service.rb
+16
-0
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
876ca63f
...
...
@@ -197,6 +197,12 @@ class Projects::MergeRequestsController < Projects::ApplicationController
return
end
merge_request_service
=
MergeRequests
::
MergeService
.
new
(
@project
,
current_user
,
merge_params
)
unless
merge_request_service
.
hooks_validation_pass?
(
@merge_request
)
@status
=
:failed
return
end
TodoService
.
new
.
merge_merge_request
(
merge_request
,
current_user
)
@merge_request
.
update
(
merge_error:
nil
)
...
...
app/services/merge_requests/merge_service.rb
View file @
876ca63f
...
...
@@ -28,6 +28,22 @@ module MergeRequests
end
end
def
hooks_validation_pass?
(
merge_request
)
git_hook
=
merge_request
.
project
.
git_hook
unless
git_hook
.
commit_message_allowed?
(
params
[
:commit_message
])
merge_request
.
update
(
merge_error:
"Commit message does not follow the pattern '
#{
git_hook
.
commit_message_regex
}
'"
)
return
false
end
unless
git_hook
.
author_email_allowed?
(
current_user
.
email
)
merge_request
.
update
(
merge_error:
"Commit author's email '
#{
current_user
.
email
}
' does not follow the pattern '
#{
git_hook
.
author_email_regex
}
'"
)
return
false
end
true
end
private
def
commit
...
...
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