diff options
author | Gauvain Pocentek <gauvain@pocentek.net> | 2018-06-07 07:14:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-07 07:14:18 +0200 |
commit | 92ca5c4f9e2c3a8651761c9b13a290df669d62a4 (patch) | |
tree | 93f857f7ef1a6d809c2b5fa7204ec322349a8177 /gitlab/v4/objects.py | |
parent | 33c245771bba81b7ab778da8df6faf12d4259e08 (diff) | |
parent | 17d935416033778c06ed89cbd9fb6990bd20d47c (diff) | |
download | gitlab-92ca5c4f9e2c3a8651761c9b13a290df669d62a4.tar.gz |
Merge pull request #517 from jouve/dedup
projectpipelinejob was defined twice
Diffstat (limited to 'gitlab/v4/objects.py')
-rw-r--r-- | gitlab/v4/objects.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py index 4c2ec45..13c9995 100644 --- 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 |