Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
ae18ba16
Commit
ae18ba16
authored
Nov 24, 2015
by
Valery Sizov
Committed by
Valery Sizov
Nov 30, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fire update hook from GitLab
parent
a8e05cec
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
3 deletions
+25
-3
CHANGELOG
CHANGELOG
+1
-0
app/models/repository.rb
app/models/repository.rb
+7
-3
lib/gitlab/git/hook.rb
lib/gitlab/git/hook.rb
+17
-0
No files found.
CHANGELOG
View file @
ae18ba16
...
...
@@ -7,6 +7,7 @@ v 8.3.0 (unreleased)
- Fix 500 error when update group member permission
- Fix: Raw private snippets access workflow
- Trim leading and trailing whitespace of milestone and issueable titles (Jose Corcuera)
- Fire update hook from GitLab
v 8.2.1
- Forcefully update builds that didn't want to update with state machine
...
...
app/models/repository.rb
View file @
ae18ba16
...
...
@@ -571,9 +571,13 @@ def commit_with_hooks(current_user, branch)
# Run GitLab pre-receive hook
pre_receive_hook
=
Gitlab
::
Git
::
Hook
.
new
(
'pre-receive'
,
path_to_repo
)
status
=
pre_receive_hook
.
trigger
(
gl_id
,
oldrev
,
newrev
,
ref
)
pre_receive_hook_
status
=
pre_receive_hook
.
trigger
(
gl_id
,
oldrev
,
newrev
,
ref
)
if
status
# Run GitLab update hook
update_hook
=
Gitlab
::
Git
::
Hook
.
new
(
'update'
,
path_to_repo
)
update_hook_status
=
update_hook
.
trigger
(
gl_id
,
oldrev
,
newrev
,
ref
)
if
pre_receive_hook_status
&&
update_hook_status
if
was_empty
# Create branch
rugged
.
references
.
create
(
ref
,
newrev
)
...
...
@@ -596,7 +600,7 @@ def commit_with_hooks(current_user, branch)
# Remove tmp ref and return error to user
rugged
.
references
.
delete
(
tmp_ref
)
raise
PreReceiveError
.
new
(
'Commit was rejected by
pre-receive
hook'
)
raise
PreReceiveError
.
new
(
'Commit was rejected by
git
hook'
)
end
end
...
...
lib/gitlab/git/hook.rb
View file @
ae18ba16
...
...
@@ -16,6 +16,17 @@ def exists?
def
trigger
(
gl_id
,
oldrev
,
newrev
,
ref
)
return
true
unless
exists?
case
name
when
"pre-receive"
,
"post-receive"
call_receive_hook
(
gl_id
,
oldrev
,
newrev
,
ref
)
when
"update"
call_update_hook
(
gl_id
,
oldrev
,
newrev
,
ref
)
end
end
private
def
call_receive_hook
(
gl_id
,
oldrev
,
newrev
,
ref
)
changes
=
[
oldrev
,
newrev
,
ref
].
join
(
" "
)
# function will return true if succesful
...
...
@@ -54,6 +65,12 @@ def trigger(gl_id, oldrev, newrev, ref)
exit_status
end
def
call_update_hook
(
gl_id
,
oldrev
,
newrev
,
ref
)
Dir
.
chdir
(
repo_path
)
do
system
({
'GL_ID'
=>
gl_id
},
path
,
ref
,
oldrev
,
newrev
)
end
end
end
end
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