bypass gitolite update hook, and set an GL_USER variable.
This commit is contained in:
parent
82e2551833
commit
401340168c
3 changed files with 17 additions and 10 deletions
|
@ -21,7 +21,7 @@ module GitPush
|
|||
|
||||
# Close merge requests
|
||||
mrs = self.merge_requests.opened.where(:target_branch => branch_name).all
|
||||
mrs = mrs.select(&:last_commit).select { |mr| c_ids.include?(mr.last_commit.id) }
|
||||
mrs = mrs.select(&:last_commit).select { |mr| c_ids.include?(mr.last_commit.id) }
|
||||
mrs.each { |merge_request| merge_request.merge!(user.id) }
|
||||
|
||||
true
|
||||
|
@ -65,7 +65,7 @@ module GitPush
|
|||
total_commits_count: push_commits_count
|
||||
}
|
||||
|
||||
# For perfomance purposes maximum 20 latest commits
|
||||
# For perfomance purposes maximum 20 latest commits
|
||||
# will be passed as post receive hook data.
|
||||
#
|
||||
push_commits_limited.each do |commit|
|
||||
|
@ -86,16 +86,14 @@ module GitPush
|
|||
|
||||
|
||||
# This method will be called after each post receive
|
||||
# and only if autor_key_id present in gitlab.
|
||||
# and only if user present in gitlab.
|
||||
# All callbacks for post receive should be placed here
|
||||
#
|
||||
def trigger_post_receive(oldrev, newrev, ref, author_key_id)
|
||||
user = Key.find_by_identifier(author_key_id).user
|
||||
|
||||
def trigger_post_receive(oldrev, newrev, ref, user)
|
||||
# Create push event
|
||||
self.observe_push(oldrev, newrev, ref, user)
|
||||
|
||||
# Close merged MR
|
||||
# Close merged MR
|
||||
self.update_merge_requests(oldrev, newrev, ref, user)
|
||||
|
||||
# Execute web hooks
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue