diff options
Diffstat (limited to 'rhodecode/controllers/pullrequests.py')
| -rw-r--r-- | rhodecode/controllers/pullrequests.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py index b05ebf8c..396a30f6 100644 --- a/rhodecode/controllers/pullrequests.py +++ b/rhodecode/controllers/pullrequests.py @@ -33,7 +33,6 @@ from itertools import groupby from pylons import request, response, session, tmpl_context as c, url from pylons.controllers.util import abort, redirect from pylons.i18n.translation import _ -from pylons.decorators import jsonify from rhodecode.lib.compat import json from rhodecode.lib.base import BaseRepoController, render @@ -41,7 +40,10 @@ from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\ NotAnonymous from rhodecode.lib import helpers as h from rhodecode.lib import diffs -from rhodecode.lib.utils import action_logger +from rhodecode.lib.utils import action_logger, jsonify +from rhodecode.lib.vcs.exceptions import EmptyRepositoryError +from rhodecode.lib.vcs.backends.base import EmptyChangeset +from rhodecode.lib.diffs import LimitedDiffContainer from rhodecode.model.db import User, PullRequest, ChangesetStatus,\ ChangesetComment from rhodecode.model.pull_request import PullRequestModel @@ -50,10 +52,6 @@ from rhodecode.model.repo import RepoModel from rhodecode.model.comment import ChangesetCommentsModel from rhodecode.model.changeset_status import ChangesetStatusModel from rhodecode.model.forms import PullRequestForm -from rhodecode.lib.vcs.exceptions import EmptyRepositoryError -from rhodecode.lib.vcs.backends.base import EmptyChangeset -from rhodecode.lib.diffs import LimitedDiffContainer -from rhodecode.lib.utils2 import str2bool log = logging.getLogger(__name__) |