Mercurial > kallithea
changeset 2139:46b67235a8f0 beta
Merged in codingtony/rhodecode (pull request #36)
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 18 Mar 2012 21:27:48 +0200 |
| parents | b70721d03e84 (current diff) 8cdb243f9046 (diff) |
| children | 636f9b948c74 |
| files | requires.txt rhodecode/__init__.py rhodecode/lib/middleware/simplegit.py |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/requires.txt Sun Mar 18 16:03:58 2012 +0200 +++ b/requires.txt Sun Mar 18 21:27:48 2012 +0200 @@ -9,9 +9,9 @@ celery>=2.2.5,<2.3 babel python-dateutil>=1.5.0,<2.0.0 -dulwich>=0.8.0,<0.9.0 +dulwich>=0.8.4,<0.9.0 webob==1.0.8 markdown==2.1.1 docutils==0.8.1 py-bcrypt -mercurial>=2.1,<2.2 \ No newline at end of file +mercurial>=2.1,<2.2
--- a/rhodecode/__init__.py Sun Mar 18 16:03:58 2012 +0200 +++ b/rhodecode/__init__.py Sun Mar 18 21:27:48 2012 +0200 @@ -57,7 +57,7 @@ "celery>=2.2.5,<2.3", "babel", "python-dateutil>=1.5.0,<2.0.0", - "dulwich>=0.8.0,<0.9.0", + "dulwich>=0.8.4,<0.9.0", "webob==1.0.8", "markdown==2.1.1", "docutils==0.8.1",
--- a/rhodecode/lib/middleware/simplegit.py Sun Mar 18 16:03:58 2012 +0200 +++ b/rhodecode/lib/middleware/simplegit.py Sun Mar 18 21:27:48 2012 +0200 @@ -65,7 +65,7 @@ } from dulwich.repo import Repo -from dulwich.web import HTTPGitApplication +from dulwich.web import make_wsgi_chain from paste.httpheaders import REMOTE_USER, AUTH_TYPE @@ -205,7 +205,7 @@ """ _d = {'/' + repo_name: Repo(repo_path)} backend = dulserver.DictBackend(_d) - gitserve = HTTPGitApplication(backend) + gitserve = make_wsgi_chain(backend) return gitserve