Commit e1dadcd0 authored by Michal Čihař's avatar Michal Čihař

Merge remote-tracking branch 'origin/master'

parents f02c2694 73f3bcf3
......@@ -32,7 +32,7 @@ repository has been updated.
``git:/github.com/owner/repo.git``, otherwise automatic detection of used
repository will fail.
.. seealso:: http:/help.github.com/post-receive-hooks/
.. seealso:: http://help.github.com/post-receive-hooks/
Exports
-------
......
......@@ -8,6 +8,7 @@ Relased on ? 2012.
* Improved validation while adding/saving subproject.
* Experimental support for Android resource files (needs patched ttkit).
* Updates from hooks are run in background.
weblate 0.9
-----------
......
......@@ -42,7 +42,7 @@
<h2>{% trans "Summaries" %}</h2>
<div class="tabs">
<div class="tabs" id="main-tabs">
<ul>
<li><a href="#changes">{% trans "Recent changes" %}</a></li>
......
......@@ -8,6 +8,7 @@ from weblate.trans.models import Project, SubProject
import json
import logging
import threading
logger = logging.getLogger('weblate')
......@@ -19,8 +20,9 @@ def update_subproject(request, project, subproject):
if not settings.ENABLE_HOOKS:
return HttpResponseNotAllowed([])
obj = get_object_or_404(SubProject, slug = subproject, project__slug = project)
obj.do_update()
return HttpResponse('updated')
t = threading.Thread(target = obj.do_update)
t.start()
return HttpResponse('update triggered')
@csrf_exempt
def update_project(request, project):
......@@ -30,8 +32,9 @@ def update_project(request, project):
if not settings.ENABLE_HOOKS:
return HttpResponseNotAllowed([])
obj = get_object_or_404(Project, slug = project)
obj.do_update()
return HttpResponse('updated')
t = threading.Thread(target = obj.do_update)
t.start()
return HttpResponse('update triggered')
@csrf_exempt
......@@ -53,11 +56,12 @@ def github_hook(request):
)
branch = data['ref'].split('/')[-1]
logger.info('received GitHub notification on repository %s, branch %s', repo, branch)
for s in SubProject.objects.filter(repo = repo, branch = branch):
logger.info('GitHub notification will update %s', s)
s.do_update()
for obj in SubProject.objects.filter(repo = repo, branch = branch):
logger.info('GitHub notification will update %s', obj)
t = threading.Thread(target = obj.do_update)
t.start()
return HttpResponse('updated')
return HttpResponse('update triggered')
def dt_handler(obj):
if hasattr(obj, 'isoformat'):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment