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
9479496f
Commit
9479496f
authored
Nov 02, 2015
by
Valery Sizov
Committed by
Valery Sizov
Nov 03, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add added, modified and removed properties to commit object in webhook
parent
b9e53258
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
3 deletions
+42
-3
CHANGELOG
CHANGELOG
+1
-0
doc/web_hooks/web_hooks.md
doc/web_hooks/web_hooks.md
+4
-1
lib/gitlab/push_data_builder.rb
lib/gitlab/push_data_builder.rb
+31
-2
spec/lib/gitlab/push_data_builder_spec.rb
spec/lib/gitlab/push_data_builder_spec.rb
+6
-0
No files found.
CHANGELOG
View file @
9479496f
...
...
@@ -17,6 +17,7 @@ v 8.2.0 (unreleased)
- Remove deprecated CI events from project settings page
- Use issue editor as cross reference comment author when issue is edited with a new mention.
- [API] Add ability to fetch the commit ID of the last commit that actually touched a file
- Add "added", "modified" and "removed" properties to commit object in webhook
v 8.1.1
- Fix cloning Wiki repositories via HTTP (Stan Hu)
...
...
doc/web_hooks/web_hooks.md
View file @
9479496f
...
...
@@ -69,7 +69,10 @@ X-Gitlab-Event: Push Hook
}
}
],
"total_commits_count"
:
4
"total_commits_count"
:
4
,
"added"
:
[
"CHANGELOG"
],
"modified"
:
[
"app/controller/application.rb"
],
"removed"
:
[]
}
```
...
...
lib/gitlab/push_data_builder.rb
View file @
9479496f
...
...
@@ -18,7 +18,10 @@ class << self
# homepage: String,
# },
# commits: Array,
# total_commits_count: Fixnum
# total_commits_count: Fixnum,
# added: ["CHANGELOG"],
# modified: [],
# removed: ["tmp/file.txt"]
# }
#
def
build
(
project
,
user
,
oldrev
,
newrev
,
ref
,
commits
=
[],
message
=
nil
)
...
...
@@ -33,6 +36,8 @@ def build(project, user, oldrev, newrev, ref, commits = [], message = nil)
commit_attrs
=
commits_limited
.
map
(
&
:hook_attrs
)
type
=
Gitlab
::
Git
.
tag_ref?
(
ref
)
?
"tag_push"
:
"push"
repo_changes
=
repo_changes
(
project
,
newrev
,
oldrev
)
# Hash to be passed as post_receive_data
data
=
{
object_kind:
type
,
...
...
@@ -55,7 +60,10 @@ def build(project, user, oldrev, newrev, ref, commits = [], message = nil)
visibility_level:
project
.
visibility_level
},
commits:
commit_attrs
,
total_commits_count:
commits_count
total_commits_count:
commits_count
,
added:
repo_changes
[
:added
],
modified:
repo_changes
[
:modified
],
removed:
repo_changes
[
:removed
]
}
data
...
...
@@ -86,6 +94,27 @@ def checkout_sha(repository, newrev, ref)
newrev
end
end
def
repo_changes
(
project
,
newrev
,
oldrev
)
changes
=
{
added:
[],
modified:
[],
removed:
[]
}
compare_result
=
CompareService
.
new
.
execute
(
project
,
newrev
,
project
,
oldrev
)
if
compare_result
compare_result
.
diffs
.
each
do
|
diff
|
case
true
when
diff
.
deleted_file
changes
[
:removed
]
<<
diff
.
old_path
when
diff
.
renamed_file
,
diff
.
new_file
changes
[
:added
]
<<
diff
.
new_path
else
changes
[
:modified
]
<<
diff
.
new_path
end
end
end
changes
end
end
end
end
spec/lib/gitlab/push_data_builder_spec.rb
View file @
9479496f
...
...
@@ -17,6 +17,9 @@
it
{
expect
(
data
[
:repository
][
:git_ssh_url
]).
to
eq
(
project
.
ssh_url_to_repo
)
}
it
{
expect
(
data
[
:repository
][
:visibility_level
]).
to
eq
(
project
.
visibility_level
)
}
it
{
expect
(
data
[
:total_commits_count
]).
to
eq
(
3
)
}
it
{
expect
(
data
[
:added
]).
to
eq
([
"gitlab-grack"
])
}
it
{
expect
(
data
[
:modified
]).
to
eq
([
".gitmodules"
,
"files/ruby/popen.rb"
,
"files/ruby/regex.rb"
])
}
it
{
expect
(
data
[
:removed
]).
to
eq
([])
}
end
describe
:build
do
...
...
@@ -35,5 +38,8 @@
it
{
expect
(
data
[
:ref
]).
to
eq
(
'refs/tags/v1.1.0'
)
}
it
{
expect
(
data
[
:commits
]).
to
be_empty
}
it
{
expect
(
data
[
:total_commits_count
]).
to
be_zero
}
it
{
expect
(
data
[
:added
]).
to
eq
([])
}
it
{
expect
(
data
[
:modified
]).
to
eq
([])
}
it
{
expect
(
data
[
:removed
]).
to
eq
([])
}
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