Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
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
nexedi
converse.js
Commits
ae6f3614
Commit
ae6f3614
authored
Jan 03, 2014
by
Weblate
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
04e88d99
4344f6e0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
0 deletions
+10
-0
weblate/trans/models/subproject.py
weblate/trans/models/subproject.py
+10
-0
No files found.
weblate/trans/models/subproject.py
View file @
ae6f3614
...
...
@@ -1059,9 +1059,19 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
return
True
def
git_needs_merge
(
self
):
'''
Checks whether there is something to merge from remote repository.
'''
if
self
.
is_repo_link
():
return
self
.
linked_subproject
.
git_needs_merge
()
return
self
.
git_check_merge
(
'..origin/%s'
%
self
.
branch
)
def
git_needs_push
(
self
):
'''
Checks whether there is something to push to remote repository.
'''
if
self
.
is_repo_link
():
return
self
.
linked_subproject
.
git_needs_push
()
return
self
.
git_check_merge
(
'origin/%s..'
%
self
.
branch
)
@
property
...
...
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