Commit92ca5c4

Gauvain Pocentek

authored

Merge pull request#517 from jouve/dedup

projectpipelinejob was defined twice

2 parents33c2457 +17d9354 commit92ca5c4Copy full SHA for 92ca5c4

File tree

-11

lines changed

-11

lines changed

Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -2248,7 +2248,7 @@ class ProjectPipelineJob(ProjectJob):`
`2248`	`2248`	`pass`
`2249`	`2249`
`2250`	`2250`
`2251`		`-classProjectPipelineJobsManager(ListMixin,RESTManager):`
	`2251`	`+classProjectPipelineJobManager(ListMixin,RESTManager):`
`2252`	`2252`	`_path='/projects/%(project_id)s/pipelines/%(pipeline_id)s/jobs'`
`2253`	`2253`	`_obj_cls=ProjectPipelineJob`
`2254`	`2254`	`_from_parent_attrs= {'project_id':'project_id',`
`@@ -2364,16 +2364,6 @@ class ProjectPipelineScheduleManager(CRUDMixin, RESTManager):`
`2364`	`2364`	`('description','ref','cron','cron_timezone','active'))`
`2365`	`2365`
`2366`	`2366`
`2367`		`-classProjectPipelineJob(ProjectJob):`
`2368`		`-pass`
`2369`		`-`
`2370`		`-`
`2371`		`-classProjectPipelineJobManager(ListMixin,RESTManager):`
`2372`		`-_path='/projects/%(project_id)s/pipelines/%(pipeline_id)s/jobs'`
`2373`		`-_obj_cls=ProjectPipelineJob`
`2374`		`-_from_parent_attrs= {'project_id':'project_id','pipeline_id':'id'}`
`2375`		`-`
`2376`		`-`
`2377`	`2367`	`classProjectSnippetNoteAwardEmoji(ObjectDeleteMixin,RESTObject):`
`2378`	`2368`	`pass`
`2379`	`2369`

Comments

(0)