##// END OF EJS Templates
Merge stable
Mads Kiilerich -
r8471:3669e58f merge default
parent child Browse files
Show More
@@ -127,7 +127,7 b' class GitRepository(object):'
127 log.error(traceback.format_exc())
127 log.error(traceback.format_exc())
128 raise exc.HTTPExpectationFailed()
128 raise exc.HTTPExpectationFailed()
129 resp = Response()
129 resp = Response()
130 resp.content_type = 'application/x-%s-advertisement' % str(git_command)
130 resp.content_type = 'application/x-%s-advertisement' % git_command
131 resp.charset = None
131 resp.charset = None
132 resp.app_iter = out
132 resp.app_iter = out
133 return resp
133 return resp
@@ -177,7 +177,7 b' class GitRepository(object):'
177 update_server_info(repo._repo)
177 update_server_info(repo._repo)
178
178
179 resp = Response()
179 resp = Response()
180 resp.content_type = 'application/x-%s-result' % git_command.encode('utf-8')
180 resp.content_type = 'application/x-%s-result' % git_command
181 resp.charset = None
181 resp.charset = None
182 resp.app_iter = out
182 resp.app_iter = out
183 return resp
183 return resp
General Comments 0
You need to be logged in to leave comments. Login now