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
0f741fb0
Commit
0f741fb0
authored
Jun 11, 2015
by
Weblate
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
141f41e6
c3661d67
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
weblate/trans/models/subproject.py
weblate/trans/models/subproject.py
+1
-0
weblate/trans/models/translation.py
weblate/trans/models/translation.py
+2
-2
weblate/trans/vcs.py
weblate/trans/vcs.py
+1
-1
No files found.
weblate/trans/models/subproject.py
View file @
0f741fb0
...
...
@@ -1417,6 +1417,7 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
translation
.
get_author_name
(
request
.
user
),
timezone
.
now
(),
force_commit
=
True
,
force_new
=
True
,
)
translation
.
check_sync
(
force
=
True
,
...
...
weblate/trans/models/translation.py
View file @
0f741fb0
...
...
@@ -791,7 +791,7 @@ class Translation(models.Model, URLMixin, PercentMixin, LoggerMixin):
return
self
.
subproject
.
repo_needs_push
()
def
git_commit
(
self
,
request
,
author
,
timestamp
,
force_commit
=
False
,
sync
=
False
,
skip_push
=
False
):
sync
=
False
,
skip_push
=
False
,
force_new
=
False
):
'''
Wrapper for commiting translation to git.
...
...
@@ -801,7 +801,7 @@ class Translation(models.Model, URLMixin, PercentMixin, LoggerMixin):
translation rescan will be needed)
'''
# Is there something for commit?
if
not
self
.
repo_needs_commit
():
if
not
self
.
repo_needs_commit
()
and
not
force_new
:
return
False
# Can we delay commit?
...
...
weblate/trans/vcs.py
View file @
0f741fb0
...
...
@@ -533,7 +533,7 @@ class GitRepository(Repository):
"""
# Add files
if
files
is
not
None
:
self
.
execute
([
'add'
,
'--'
]
+
files
)
self
.
execute
([
'add'
,
'--
force'
,
'--
'
]
+
files
)
# Build the commit command
cmd
=
[
...
...
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