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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
e04e957b
Commit
e04e957b
authored
Jan 11, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-duplicate-branch-activity' of
https://gitlab.com/stanhu/gitlab-ce
parents
17f6a916
423d2d62
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
2 deletions
+1
-2
CHANGELOG
CHANGELOG
+1
-0
app/services/create_branch_service.rb
app/services/create_branch_service.rb
+0
-1
app/services/delete_branch_service.rb
app/services/delete_branch_service.rb
+0
-1
No files found.
CHANGELOG
View file @
e04e957b
...
@@ -35,6 +35,7 @@ v 8.4.0 (unreleased)
...
@@ -35,6 +35,7 @@ v 8.4.0 (unreleased)
v 8.3.3 (unreleased)
v 8.3.3 (unreleased)
- Preserve CE behavior with JIRA integration by only calling API if URL is set
- Preserve CE behavior with JIRA integration by only calling API if URL is set
- Fix duplicated branch creation/deletion events when using Web UI (Stan Hu)
- Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running
- Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running
- Suppress e-mails on failed builds if allow_failure is set (Stan Hu)
- Suppress e-mails on failed builds if allow_failure is set (Stan Hu)
- Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu)
- Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu)
...
...
app/services/create_branch_service.rb
View file @
e04e957b
...
@@ -31,7 +31,6 @@ class CreateBranchService < BaseService
...
@@ -31,7 +31,6 @@ class CreateBranchService < BaseService
if
new_branch
if
new_branch
push_data
=
build_push_data
(
project
,
current_user
,
new_branch
)
push_data
=
build_push_data
(
project
,
current_user
,
new_branch
)
EventCreateService
.
new
.
push
(
project
,
current_user
,
push_data
)
project
.
execute_hooks
(
push_data
.
dup
,
:push_hooks
)
project
.
execute_hooks
(
push_data
.
dup
,
:push_hooks
)
project
.
execute_services
(
push_data
.
dup
,
:push_hooks
)
project
.
execute_services
(
push_data
.
dup
,
:push_hooks
)
...
...
app/services/delete_branch_service.rb
View file @
e04e957b
...
@@ -27,7 +27,6 @@ class DeleteBranchService < BaseService
...
@@ -27,7 +27,6 @@ class DeleteBranchService < BaseService
if
repository
.
rm_branch
(
current_user
,
branch_name
)
if
repository
.
rm_branch
(
current_user
,
branch_name
)
push_data
=
build_push_data
(
branch
)
push_data
=
build_push_data
(
branch
)
EventCreateService
.
new
.
push
(
project
,
current_user
,
push_data
)
project
.
execute_hooks
(
push_data
.
dup
,
:push_hooks
)
project
.
execute_hooks
(
push_data
.
dup
,
:push_hooks
)
project
.
execute_services
(
push_data
.
dup
,
:push_hooks
)
project
.
execute_services
(
push_data
.
dup
,
:push_hooks
)
...
...
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