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
2d1d6fc0
Commit
2d1d6fc0
authored
Jul 06, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Group web_hook fix
parent
13ed1226
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
2 deletions
+22
-2
CHANGELOG-EE
CHANGELOG-EE
+4
-1
app/models/project.rb
app/models/project.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+17
-0
No files found.
CHANGELOG-EE
View file @
2d1d6fc0
v7.13.1
v 7.13.2
- Fix group web hook
v 7.13.1
- Merge community edition changes for version 7.13.1
- Fix: "Rebase before merge" doesn't work when source branch is in the same project
...
...
app/models/project.rb
View file @
2d1d6fc0
...
...
@@ -512,7 +512,7 @@ class Project < ActiveRecord::Base
end
if
group
group
.
hooks
.
send
(
hooks_scope
).
each
do
|
hook
|
hook
.
async_execute
(
data
)
hook
.
async_execute
(
data
,
hooks_scope
.
to_s
)
end
end
end
...
...
spec/models/project_spec.rb
View file @
2d1d6fc0
...
...
@@ -365,6 +365,23 @@ describe Project do
end
end
describe
:execute_hooks
do
it
"triggers project and group hooks"
do
group
=
create
:group
,
name:
'gitlab'
project
=
create
(
:project
,
name:
'gitlabhq'
,
namespace:
group
)
project_hook
=
create
(
:project_hook
,
push_events:
true
,
project:
project
)
group_hook
=
create
(
:group_hook
,
push_events:
true
,
group:
group
)
stub_request
(
:post
,
project_hook
.
url
)
stub_request
(
:post
,
group_hook
.
url
)
expect_any_instance_of
(
ProjectHook
).
to
receive
(
:async_execute
).
and_return
(
true
)
expect_any_instance_of
(
GroupHook
).
to
receive
(
:async_execute
).
and_return
(
true
)
project
.
execute_hooks
({},
:push_hooks
)
end
end
describe
:avatar_url
do
subject
{
project
.
avatar_url
}
...
...
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