comparison rhodecode/controllers/branches.py @ 2109:8ecfed1d8f8b beta

utils/conf - created temporary utils2 - made config.conf for storing some configurations - fixed some dependency import problems - code cleanup - rc-extensions now properly work for celery
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 07 Mar 2012 02:18:22 +0200
parents 89efedac4e6c
children dc2584ba5fbc a07e04ef7bb4
comparison
equal deleted inserted replaced
2108:9e377342802c 2109:8ecfed1d8f8b
29 import binascii 29 import binascii
30 30
31 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator 31 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
32 from rhodecode.lib.base import BaseRepoController, render 32 from rhodecode.lib.base import BaseRepoController, render
33 from rhodecode.lib.compat import OrderedDict 33 from rhodecode.lib.compat import OrderedDict
34 from rhodecode.lib import safe_unicode 34 from rhodecode.lib.utils2 import safe_unicode
35 log = logging.getLogger(__name__) 35 log = logging.getLogger(__name__)
36 36
37 37
38 class BranchesController(BaseRepoController): 38 class BranchesController(BaseRepoController):
39 39