diff --git a/ChangeLog.rst b/ChangeLog.rst index a9cb51652..5b2c49781 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,11 @@ ChangeLog ========= +Version 1.5.1_ - 2018-06-23 +--------------------------- + +* Fix the ProjectPipelineJob base class (regression) + Version 1.5.0_ - 2018-06-22 --------------------------- @@ -638,6 +643,7 @@ Version 0.1 - 2013-07-08 * Initial release +.. _1.5.1: https://github.com/python-gitlab/python-gitlab/compare/1.4.0...1.5.1 .. _1.5.0: https://github.com/python-gitlab/python-gitlab/compare/1.4.0...1.5.0 .. _1.4.0: https://github.com/python-gitlab/python-gitlab/compare/1.3.0...1.4.0 .. _1.3.0: https://github.com/python-gitlab/python-gitlab/compare/1.2.0...1.3.0 diff --git a/docs/gl_objects/protected_branches.rst b/docs/gl_objects/protected_branches.rst index 006bb8bc8..bd2b22b87 100644 --- a/docs/gl_objects/protected_branches.rst +++ b/docs/gl_objects/protected_branches.rst @@ -29,7 +29,11 @@ Get a single protected branch:: Create a protected branch:: - p_branch = project.protectedbranches.create({'name': '*-stable'}) + p_branch = project.protectedbranches.create({ + 'name': '*-stable', + 'merge_access_level': gitlab.DEVELOPER_ACCESS, + 'push_access_level': gitlab.MASTER_ACCESS + }) Delete a protected branch:: diff --git a/gitlab/__init__.py b/gitlab/__init__.py index 0c69a99a6..1c13093a9 100644 --- a/gitlab/__init__.py +++ b/gitlab/__init__.py @@ -30,7 +30,7 @@ from gitlab.exceptions import * # noqa __title__ = 'python-gitlab' -__version__ = '1.5.0' +__version__ = '1.5.1' __author__ = 'Gauvain Pocentek' __email__ = 'gauvain@pocentek.net' __license__ = 'LGPL3' diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py index 4f571583d..9327e06f7 100644 --- a/gitlab/v4/objects.py +++ b/gitlab/v4/objects.py @@ -2494,7 +2494,7 @@ def raw(self, file_path, ref, streamed=False, action=None, chunk_size=1024, return utils.response_content(result, streamed, action, chunk_size) -class ProjectPipelineJob(RESTManager): +class ProjectPipelineJob(RESTObject): pass