summaryrefslogtreecommitdiff
path: root/gitlab/__init__.py
diff options
context:
space:
mode:
authorRoger Meier <r.meier@siemens.com>2020-06-09 13:55:33 +0200
committerGitHub <noreply@github.com>2020-06-09 13:55:33 +0200
commit3f585ad3f823aef4dd848942399e2bd0530a09b2 (patch)
tree5cbb7bb48fd84e41b3206fc04253e3fa55271c88 /gitlab/__init__.py
parent1f7dbc8dfb9c200d31ce8fad06feb235cade1481 (diff)
parent870e7ea12ee424eb2454dd7d4b7906f89fbfea64 (diff)
downloadgitlab-2.3.1.tar.gz
Merge pull request #1115 from python-gitlab/fix/keyset-pagination-revertv2.3.1
Fix/keyset pagination revert
Diffstat (limited to 'gitlab/__init__.py')
-rw-r--r--gitlab/__init__.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
index d02389d..ee2b074 100644
--- a/gitlab/__init__.py
+++ b/gitlab/__init__.py
@@ -29,7 +29,7 @@ from gitlab.exceptions import * # noqa
from gitlab import utils # noqa
__title__ = "python-gitlab"
-__version__ = "2.3.0"
+__version__ = "2.3.1"
__author__ = "Gauvain Pocentek"
__email__ = "gauvainpocentek@gmail.com"
__license__ = "LGPL3"
@@ -643,17 +643,7 @@ class Gitlab(object):
get_all = kwargs.pop("all", False)
url = self._build_url(path)
- order_by = kwargs.get("order_by")
- pagination = kwargs.get("pagination")
page = kwargs.get("page")
- if (
- path in ALLOWED_KEYSET_ENDPOINTS
- and (not order_by or order_by == "id")
- and (not pagination or pagination == "keyset")
- and not page
- ):
- kwargs["pagination"] = "keyset"
- kwargs["order_by"] = "id"
if get_all is True and as_list is True:
return list(GitlabList(self, url, query_data, **kwargs))