Merge pull request #517 from jouve/dedup

Gauvain Pocentek · web-flow · commit 92ca5c4f9e2c · 2018-06-07T07:14:18.000+02:00
projectpipelinejob was defined twice
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
@@ -2248,7 +2248,7 @@ class ProjectPipelineJob(ProjectJob):
     pass
 
 
-class ProjectPipelineJobsManager(ListMixin, RESTManager):
+class ProjectPipelineJobManager(ListMixin, RESTManager):
     _path = '/projects/%(project_id)s/pipelines/%(pipeline_id)s/jobs'
     _obj_cls = ProjectPipelineJob
     _from_parent_attrs = {'project_id': 'project_id',
@@ -2364,16 +2364,6 @@ class ProjectPipelineScheduleManager(CRUDMixin, RESTManager):
                      ('description', 'ref', 'cron', 'cron_timezone', 'active'))
 
 
-class ProjectPipelineJob(ProjectJob):
-    pass
-
-
-class ProjectPipelineJobManager(ListMixin, RESTManager):
-    _path = '/projects/%(project_id)s/pipelines/%(pipeline_id)s/jobs'
-    _obj_cls = ProjectPipelineJob
-    _from_parent_attrs = {'project_id': 'project_id', 'pipeline_id': 'id'}
-
-
 class ProjectSnippetNoteAwardEmoji(ObjectDeleteMixin, RESTObject):
     pass
 
