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
a932e28d
Commit
a932e28d
authored
Sep 26, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix worker error when remove branch
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
87cf5b70
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
app/services/git_push_service.rb
app/services/git_push_service.rb
+7
-9
No files found.
app/services/git_push_service.rb
View file @
a932e28d
...
@@ -22,11 +22,8 @@ class GitPushService
...
@@ -22,11 +22,8 @@ class GitPushService
project
.
update_repository_size
project
.
update_repository_size
if
push_to_branch?
(
ref
)
if
push_to_branch?
(
ref
)
if
push_to_existing_branch?
(
ref
,
oldrev
)
if
push_remove_branch_branch?
(
ref
,
newrev
)
# Collect data for this git push
@push_commits
=
[]
@push_commits
=
project
.
repository
.
commits_between
(
oldrev
,
newrev
)
project
.
update_merge_requests
(
oldrev
,
newrev
,
ref
,
@user
)
process_commit_messages
(
ref
)
elsif
push_to_new_branch?
(
ref
,
oldrev
)
elsif
push_to_new_branch?
(
ref
,
oldrev
)
# Re-find the pushed commits.
# Re-find the pushed commits.
if
is_default_branch?
(
ref
)
if
is_default_branch?
(
ref
)
...
@@ -38,11 +35,12 @@ class GitPushService
...
@@ -38,11 +35,12 @@ class GitPushService
# that shouldn't matter because we check for existing cross-references later.
# that shouldn't matter because we check for existing cross-references later.
@push_commits
=
project
.
repository
.
commits_between
(
project
.
default_branch
,
newrev
)
@push_commits
=
project
.
repository
.
commits_between
(
project
.
default_branch
,
newrev
)
end
end
process_commit_messages
(
ref
)
process_commit_messages
(
ref
)
elsif
push_to_existing_branch?
(
ref
,
oldrev
)
elsif
push_remove_branch_branch?
(
ref
,
newrev
)
# Collect data for this git push
@push_commits
=
[]
@push_commits
=
project
.
repository
.
commits_between
(
oldrev
,
newrev
)
project
.
update_merge_requests
(
oldrev
,
newrev
,
ref
,
@user
)
process_commit_messages
(
ref
)
end
end
@push_data
=
post_receive_data
(
oldrev
,
newrev
,
ref
)
@push_data
=
post_receive_data
(
oldrev
,
newrev
,
ref
)
...
...
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