summaryrefslogtreecommitdiff
path: root/gitlab/v4
diff options
context:
space:
mode:
Diffstat (limited to 'gitlab/v4')
-rw-r--r--gitlab/v4/objects/merge_requests.py4
-rw-r--r--gitlab/v4/objects/pipelines.py10
2 files changed, 7 insertions, 7 deletions
diff --git a/gitlab/v4/objects/merge_requests.py b/gitlab/v4/objects/merge_requests.py
index a1ef026..3bb848d 100644
--- a/gitlab/v4/objects/merge_requests.py
+++ b/gitlab/v4/objects/merge_requests.py
@@ -25,7 +25,7 @@ from .events import (
ProjectMergeRequestResourceLabelEventManager,
ProjectMergeRequestResourceMilestoneEventManager,
)
-from .pipelines import MergeRequestPipelineManager
+from .pipelines import ProjectMergeRequestPipelineManager
__all__ = [
@@ -120,7 +120,7 @@ class ProjectMergeRequest(
("diffs", "ProjectMergeRequestDiffManager"),
("discussions", "ProjectMergeRequestDiscussionManager"),
("notes", "ProjectMergeRequestNoteManager"),
- ("pipelines", "MergeRequestPipelineManager"),
+ ("pipelines", "ProjectMergeRequestPipelineManager"),
("resourcelabelevents", "ProjectMergeRequestResourceLabelEventManager"),
("resourcemilestoneevents", "ProjectMergeRequestResourceMilestoneEventManager"),
)
diff --git a/gitlab/v4/objects/pipelines.py b/gitlab/v4/objects/pipelines.py
index 8024ad1..cb12d8e 100644
--- a/gitlab/v4/objects/pipelines.py
+++ b/gitlab/v4/objects/pipelines.py
@@ -17,8 +17,8 @@ from gitlab.mixins import (
__all__ = [
- "MergeRequestPipeline",
- "MergeRequestPipelineManager",
+ "ProjectMergeRequestPipeline",
+ "ProjectMergeRequestPipelineManager",
"ProjectPipeline",
"ProjectPipelineManager",
"ProjectPipelineJob",
@@ -34,13 +34,13 @@ __all__ = [
]
-class MergeRequestPipeline(RESTObject):
+class ProjectMergeRequestPipeline(RESTObject):
pass
-class MergeRequestPipelineManager(CreateMixin, ListMixin, RESTManager):
+class ProjectMergeRequestPipelineManager(CreateMixin, ListMixin, RESTManager):
_path = "/projects/%(project_id)s/merge_requests/%(mr_iid)s/pipelines"
- _obj_cls = MergeRequestPipeline
+ _obj_cls = ProjectMergeRequestPipeline
_from_parent_attrs = {"project_id": "project_id", "mr_iid": "iid"}
_create_attrs = (tuple(), tuple())