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
ff1f58ec
Commit
ff1f58ec
authored
Jan 26, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix updating of branches in mirrored repository
parent
aa2f58eb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG-EE
CHANGELOG-EE
+1
-0
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-1
app/services/git_push_service.rb
app/services/git_push_service.rb
+1
-1
No files found.
CHANGELOG-EE
View file @
ff1f58ec
v 8.5.0 (unreleased)
- Fix updating of branches in mirrored repository
v 8.4.1
- No EE-specific changes
...
...
app/helpers/application_helper.rb
View file @
ff1f58ec
...
...
@@ -142,7 +142,7 @@ module ApplicationHelper
return
false
unless
project
.
repository
.
branch_names
.
include?
(
event
.
branch_name
)
# Skip if this was a mirror update
return
false
if
project
.
mirror?
&&
project
.
up_to_date_with_upstream?
(
event
.
branch_name
)
return
false
if
project
.
mirror?
&&
project
.
repository
.
up_to_date_with_upstream?
(
event
.
branch_name
)
true
end
...
...
app/services/git_push_service.rb
View file @
ff1f58ec
...
...
@@ -59,7 +59,7 @@ class GitPushService
@push_data
=
build_push_data
(
oldrev
,
newrev
,
ref
)
branch_name
=
Gitlab
::
Git
.
ref_name
(
ref
)
mirror_update
=
project
.
mirror?
&&
project
.
up_to_date_with_upstream?
(
branch_name
)
mirror_update
=
project
.
mirror?
&&
project
.
repository
.
up_to_date_with_upstream?
(
branch_name
)
EventCreateService
.
new
.
push
(
project
,
user
,
@push_data
)
project
.
execute_hooks
(
@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