rhodecode-enterprise-ce Commit - r5659:822bcfab

25

import traceback

25

import traceback

26

import collections

26

import collections

27

28

from pyramid.threadlocal import get_current_registry, ~~get_current_request~~

28

from pyramid.threadlocal import get_current_registry

29

from sqlalchemy.sql.expression import null

29

from sqlalchemy.sql.expression import null

30

from sqlalchemy.sql.functions import coalesce

30

from sqlalchemy.sql.functions import coalesce

31

32

from rhodecode.lib import helpers as h, diffs, channelstream, hooks_utils

32

from rhodecode.lib import helpers as h, diffs, channelstream, hooks_utils

33

from rhodecode.lib import audit_logger

33

from rhodecode.lib import audit_logger

34

from rhodecode.lib.pyramid_utils import get_current_request

34

from rhodecode.lib.exceptions import CommentVersionMismatch

35

from rhodecode.lib.exceptions import CommentVersionMismatch

35

from rhodecode.lib.utils2 import extract_mentioned_users, safe_str, safe_int

36

from rhodecode.lib.utils2 import extract_mentioned_users, safe_str, safe_int

36

from rhodecode.model import BaseModel

37

from rhodecode.model import BaseModel

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             import traceback
             import collections
-            from pyramid.threadlocal import get_current_registry, get_current_request
+            from pyramid.threadlocal import get_current_registry
             from sqlalchemy.sql.expression import null
             from sqlalchemy.sql.functions import coalesce
             from rhodecode.lib import helpers as h, diffs, channelstream, hooks_utils
             from rhodecode.lib import audit_logger
+            from rhodecode.lib.pyramid_utils import get_current_request
             from rhodecode.lib.exceptions import CommentVersionMismatch
             from rhodecode.lib.utils2 import extract_mentioned_users, safe_str, safe_int
             from rhodecode.model import BaseModel