Show More
@@ -15,4 +15,5 b' List of contributors to RhodeCode projec' | |||||
15 | Les Peabody <lpeabody@gmail.com> |
|
15 | Les Peabody <lpeabody@gmail.com> | |
16 | Jonas Oberschweiber <jonas.oberschweiber@d-velop.de> |
|
16 | Jonas Oberschweiber <jonas.oberschweiber@d-velop.de> | |
17 | Matt Zuba <matt.zuba@goodwillaz.org> |
|
17 | Matt Zuba <matt.zuba@goodwillaz.org> | |
18 | Aras Pranckevicius <aras@unity3d.com> No newline at end of file |
|
18 | Aras Pranckevicius <aras@unity3d.com> | |
|
19 | Tony Bussieres <t.bussieres@gmail.com> |
@@ -20,6 +20,7 b' fixes' | |||||
20 | - fixed git protocol issues with repos-groups |
|
20 | - fixed git protocol issues with repos-groups | |
21 | - fixed git remote repos validator that prevented from cloning remote git repos |
|
21 | - fixed git remote repos validator that prevented from cloning remote git repos | |
22 | - fixes #370 ending slashes fixes for repo and groups |
|
22 | - fixes #370 ending slashes fixes for repo and groups | |
|
23 | - fixes #368 improved git-protocol detection to handle other clients | |||
23 |
|
24 | |||
24 | 1.3.1 (**2012-02-27**) |
|
25 | 1.3.1 (**2012-02-27**) | |
25 | ---------------------- |
|
26 | ---------------------- |
@@ -13,6 +13,6 b'' | |||||
13 | <div style="padding:5px"> |
|
13 | <div style="padding:5px"> | |
14 | <a href="http://flattr.com/thing/167489/RhodeCode" target="_blank"> |
|
14 | <a href="http://flattr.com/thing/167489/RhodeCode" target="_blank"> | |
15 | <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a> |
|
15 | <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a> | |
16 |
</div> |
|
16 | </div> | |
17 | </div> |
|
17 | </div> | |
18 | {% endblock %}} |
|
18 | {% endblock %}} |
@@ -231,7 +231,7 b' def safe_str(unicode_, to_encoding=None)' | |||||
231 | :rtype: str |
|
231 | :rtype: str | |
232 | :returns: str object |
|
232 | :returns: str object | |
233 | """ |
|
233 | """ | |
234 |
|
234 | |||
235 | # if it's not basestr cast to str |
|
235 | # if it's not basestr cast to str | |
236 | if not isinstance(unicode_, basestring): |
|
236 | if not isinstance(unicode_, basestring): | |
237 | return str(unicode_) |
|
237 | return str(unicode_) |
@@ -82,9 +82,11 b' log = logging.getLogger(__name__)' | |||||
82 |
|
82 | |||
83 | GIT_PROTO_PAT = re.compile(r'git-upload-pack|git-receive-pack|info\/refs') |
|
83 | GIT_PROTO_PAT = re.compile(r'git-upload-pack|git-receive-pack|info\/refs') | |
84 |
|
84 | |||
|
85 | ||||
85 | def is_git(action): |
|
86 | def is_git(action): | |
86 | return action in ['pull','push'] |
|
87 | return action in ['pull','push'] | |
87 |
|
88 | |||
|
89 | ||||
88 | class SimpleGit(BaseVCSController): |
|
90 | class SimpleGit(BaseVCSController): | |
89 |
|
91 | |||
90 | def _handle_request(self, environ, start_response): |
|
92 | def _handle_request(self, environ, start_response): | |
@@ -230,16 +232,18 b' class SimpleGit(BaseVCSController):' | |||||
230 | return User.get_by_username(username) |
|
232 | return User.get_by_username(username) | |
231 |
|
233 | |||
232 | def __get_action(self, environ): |
|
234 | def __get_action(self, environ): | |
233 | """Maps git request commands into a pull or push command. |
|
235 | """ | |
|
236 | Maps git request commands into a pull or push command. | |||
234 |
|
237 | |||
235 | :param environ: |
|
238 | :param environ: | |
236 | """ |
|
239 | """ | |
237 | service = environ['QUERY_STRING'].split('=') |
|
240 | service = environ['QUERY_STRING'].split('=') | |
238 | if len(service) > 1: |
|
241 | if len(service) > 1: | |
239 | service_cmd = service[1] |
|
242 | service_cmd = service[1] | |
240 |
mapping = { |
|
243 | mapping = { | |
241 |
|
|
244 | 'git-receive-pack': 'push', | |
242 | } |
|
245 | 'git-upload-pack': 'pull', | |
|
246 | } | |||
243 |
|
247 | |||
244 | return mapping.get(service_cmd, |
|
248 | return mapping.get(service_cmd, | |
245 | service_cmd if service_cmd else 'other') |
|
249 | service_cmd if service_cmd else 'other') |
@@ -1038,7 +1038,7 b' class CacheInvalidation(Base, BaseModel)' | |||||
1038 | prefix = '' |
|
1038 | prefix = '' | |
1039 | iid = rhodecode.CONFIG.get('instance_id') |
|
1039 | iid = rhodecode.CONFIG.get('instance_id') | |
1040 | if iid: |
|
1040 | if iid: | |
1041 |
prefix = iid |
|
1041 | prefix = iid | |
1042 | return "%s%s" % (prefix, key) |
|
1042 | return "%s%s" % (prefix, key) | |
1043 |
|
1043 | |||
1044 | @classmethod |
|
1044 | @classmethod |
@@ -672,7 +672,7 b' def RepoForm(edit=False, old_data={}, su' | |||||
672 | user = All(UnicodeString(not_empty=True), ValidRepoUser) |
|
672 | user = All(UnicodeString(not_empty=True), ValidRepoUser) | |
673 |
|
673 | |||
674 | chained_validators = [ValidCloneUri()(), |
|
674 | chained_validators = [ValidCloneUri()(), | |
675 |
ValidRepoName(edit, old_data), |
|
675 | ValidRepoName(edit, old_data), | |
676 | ValidPerms()] |
|
676 | ValidPerms()] | |
677 | return _RepoForm |
|
677 | return _RepoForm | |
678 |
|
678 |
General Comments 0
You need to be logged in to leave comments.
Login now