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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
d295f743
Commit
d295f743
authored
Jan 11, 2016
by
Dmitriy Zaporozhets
Committed by
Robert Speicher
Jan 11, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'fix-duplicate-branch-activity' of
https://gitlab.com/stanhu/gitlab-ce
parent
78d9c904
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 @
d295f743
...
...
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.3.3 (unreleased)
- 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
- 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)
...
...
app/services/create_branch_service.rb
View file @
d295f743
...
...
@@ -18,7 +18,6 @@ class CreateBranchService < BaseService
if
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_services
(
push_data
.
dup
,
:push_hooks
)
...
...
app/services/delete_branch_service.rb
View file @
d295f743
...
...
@@ -27,7 +27,6 @@ class DeleteBranchService < BaseService
if
repository
.
rm_branch
(
current_user
,
branch_name
)
push_data
=
build_push_data
(
branch
)
EventCreateService
.
new
.
push
(
project
,
current_user
,
push_data
)
project
.
execute_hooks
(
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