Show More
@@ -39,12 +39,12 b' from rhodecode.lib.auth import (' | |||||
39 | LoginRequired, NotAnonymous, HasPermissionAll, |
|
39 | LoginRequired, NotAnonymous, HasPermissionAll, | |
40 | HasRepoGroupPermissionAll, HasRepoGroupPermissionAnyDecorator) |
|
40 | HasRepoGroupPermissionAll, HasRepoGroupPermissionAnyDecorator) | |
41 | from rhodecode.lib.base import BaseController, render |
|
41 | from rhodecode.lib.base import BaseController, render | |
|
42 | from rhodecode.lib.utils2 import safe_int | |||
42 | from rhodecode.model.db import RepoGroup, User |
|
43 | from rhodecode.model.db import RepoGroup, User | |
43 | from rhodecode.model.scm import RepoGroupList |
|
44 | from rhodecode.model.scm import RepoGroupList | |
44 | from rhodecode.model.repo_group import RepoGroupModel |
|
45 | from rhodecode.model.repo_group import RepoGroupModel | |
45 | from rhodecode.model.forms import RepoGroupForm, RepoGroupPermsForm |
|
46 | from rhodecode.model.forms import RepoGroupForm, RepoGroupPermsForm | |
46 | from rhodecode.model.meta import Session |
|
47 | from rhodecode.model.meta import Session | |
47 | from rhodecode.lib.utils2 import safe_int |
|
|||
48 |
|
48 | |||
49 |
|
49 | |||
50 | log = logging.getLogger(__name__) |
|
50 | log = logging.getLogger(__name__) |
@@ -41,15 +41,11 b' from rhodecode.lib.auth import (' | |||||
41 | HasRepoGroupPermissionAny, HasRepoPermissionAnyDecorator) |
|
41 | HasRepoGroupPermissionAny, HasRepoPermissionAnyDecorator) | |
42 | from rhodecode.lib.base import BaseRepoController, render |
|
42 | from rhodecode.lib.base import BaseRepoController, render | |
43 | from rhodecode.lib.ext_json import json |
|
43 | from rhodecode.lib.ext_json import json | |
44 |
from rhodecode.lib. |
|
44 | from rhodecode.lib.utils import repo_name_slug, jsonify | |
45 | from rhodecode.lib.utils import action_logger, repo_name_slug, jsonify |
|
|||
46 | from rhodecode.lib.utils2 import safe_int, str2bool |
|
45 | from rhodecode.lib.utils2 import safe_int, str2bool | |
47 |
from rhodecode.l |
|
46 | from rhodecode.model.db import (Repository, RepoGroup, RepositoryField) | |
48 | from rhodecode.model.db import ( |
|
|||
49 | User, Repository, UserFollowing, RepoGroup, RepositoryField) |
|
|||
50 | from rhodecode.model.forms import ( |
|
47 | from rhodecode.model.forms import ( | |
51 |
RepoForm, RepoFieldForm, Repo |
|
48 | RepoForm, RepoFieldForm, RepoVcsSettingsForm, IssueTrackerPatternsForm) | |
52 | IssueTrackerPatternsForm) |
|
|||
53 | from rhodecode.model.meta import Session |
|
49 | from rhodecode.model.meta import Session | |
54 | from rhodecode.model.repo import RepoModel |
|
50 | from rhodecode.model.repo import RepoModel | |
55 | from rhodecode.model.scm import ScmModel, RepoGroupList, RepoList |
|
51 | from rhodecode.model.scm import ScmModel, RepoGroupList, RepoList |
@@ -35,6 +35,7 b' from sqlalchemy.orm import joinedload' | |||||
35 |
|
35 | |||
36 | from rhodecode.lib import auth |
|
36 | from rhodecode.lib import auth | |
37 | from rhodecode.lib import helpers as h |
|
37 | from rhodecode.lib import helpers as h | |
|
38 | from rhodecode.lib.ext_json import json | |||
38 | from rhodecode.lib.exceptions import UserGroupAssignedException,\ |
|
39 | from rhodecode.lib.exceptions import UserGroupAssignedException,\ | |
39 | RepoGroupAssignmentError |
|
40 | RepoGroupAssignmentError | |
40 | from rhodecode.lib.utils import jsonify, action_logger |
|
41 | from rhodecode.lib.utils import jsonify, action_logger | |
@@ -52,8 +53,7 b' from rhodecode.model.forms import (' | |||||
52 | UserGroupForm, UserGroupPermsForm, UserIndividualPermissionsForm, |
|
53 | UserGroupForm, UserGroupPermsForm, UserIndividualPermissionsForm, | |
53 | UserPermissionsForm) |
|
54 | UserPermissionsForm) | |
54 | from rhodecode.model.meta import Session |
|
55 | from rhodecode.model.meta import Session | |
55 | from rhodecode.lib.utils import action_logger |
|
56 | ||
56 | from rhodecode.lib.ext_json import json |
|
|||
57 |
|
57 | |||
58 | log = logging.getLogger(__name__) |
|
58 | log = logging.getLogger(__name__) | |
59 |
|
59 |
@@ -39,7 +39,7 b' from rhodecode.lib.base import BaseRepoC' | |||||
39 | from rhodecode.lib.compat import OrderedDict |
|
39 | from rhodecode.lib.compat import OrderedDict | |
40 | from rhodecode.lib.exceptions import StatusChangeOnClosedPullRequestError |
|
40 | from rhodecode.lib.exceptions import StatusChangeOnClosedPullRequestError | |
41 | import rhodecode.lib.helpers as h |
|
41 | import rhodecode.lib.helpers as h | |
42 |
from rhodecode.lib.utils import |
|
42 | from rhodecode.lib.utils import jsonify | |
43 | from rhodecode.lib.utils2 import safe_unicode |
|
43 | from rhodecode.lib.utils2 import safe_unicode | |
44 | from rhodecode.lib.vcs.backends.base import EmptyCommit |
|
44 | from rhodecode.lib.vcs.backends.base import EmptyCommit | |
45 | from rhodecode.lib.vcs.exceptions import ( |
|
45 | from rhodecode.lib.vcs.exceptions import ( | |
@@ -48,7 +48,6 b' from rhodecode.model.db import Changeset' | |||||
48 | from rhodecode.model.changeset_status import ChangesetStatusModel |
|
48 | from rhodecode.model.changeset_status import ChangesetStatusModel | |
49 | from rhodecode.model.comment import CommentsModel |
|
49 | from rhodecode.model.comment import CommentsModel | |
50 | from rhodecode.model.meta import Session |
|
50 | from rhodecode.model.meta import Session | |
51 | from rhodecode.model.repo import RepoModel |
|
|||
52 |
|
51 | |||
53 |
|
52 | |||
54 | log = logging.getLogger(__name__) |
|
53 | log = logging.getLogger(__name__) |
General Comments 0
You need to be logged in to leave comments.
Login now