Commit 496e7316 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'touchups'

36a8ec42 api/projects: sort endpoint imports
ba9618b3

 api/doc: move note to the right endpoint
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Brad King's avatarBrad King <brad.king@kitware.com>
Merge-request: !261
parents 327b8cb4 36a8ec42
......@@ -58,12 +58,12 @@ These API endpoints have been implemented.
* `POST /projects/:project/merge_requests` `projects/merge_requests/create.rs`
* `GET /projects/:project/merge_requests/:merge_request` `projects/merge_requests/merge_request.rs`
* `PUT /projects/:project/merge_requests/:merge_request` `projects/merge_requests/edit.rs`
This should be a `POST` action.
https://gitlab.com/gitlab-org/gitlab/-/issues/219324
* `PUT /projects/:project/merge_requests/:merge_request/merge` `projects/merge_requests/merge.rs`
This should be a `POST` action.
https://gitlab.com/gitlab-org/gitlab/-/issues/219324
* `PUT /projects/:project/merge_requests/:merge_request/rebase` `projects/merge_requests/rebase.rs`
This should be a `POST` action.
https://gitlab.com/gitlab-org/gitlab/-/issues/219324
* `POST /projects/:project/merge_requests/:merge_request/approve` `projects/merge_requests/approve.rs`
* `POST /projects/:project/merge_requests/:merge_request/unapprove` `projects/merge_requests/unapprove.rs`
* `GET /projects/:project/merge_requests/:merge_request/award_emoji` `projects/merge_requests/awards/awards.rs`
......
......@@ -22,6 +22,9 @@ mod rebase;
mod resource_label_events;
mod unapprove;
pub use self::approve::ApproveMergeRequest;
pub use self::approve::ApproveMergeRequestBuilder;
pub use self::create::CreateMergeRequest;
pub use self::create::CreateMergeRequestBuilder;
......@@ -32,19 +35,11 @@ pub use self::edit::MergeRequestStateEvent;
pub use self::issues_closed_by::IssuesClosedBy;
pub use self::issues_closed_by::IssuesClosedByBuilder;
pub use self::merge_request::MergeRequest;
pub use self::merge_request::MergeRequestBuilder;
pub use self::rebase::RebaseMergeRequest;
pub use self::rebase::RebaseMergeRequestBuilder;
pub use self::merge::MergeMergeRequest;
pub use self::merge::MergeMergeRequestBuilder;
pub use self::approve::ApproveMergeRequest;
pub use self::approve::ApproveMergeRequestBuilder;
pub use self::unapprove::UnapproveMergeRequest;
pub use self::unapprove::UnapproveMergeRequestBuilder;
pub use self::merge_request::MergeRequest;
pub use self::merge_request::MergeRequestBuilder;
pub use self::merge_requests::MergeRequestOrderBy;
pub use self::merge_requests::MergeRequestScope;
......@@ -53,5 +48,11 @@ pub use self::merge_requests::MergeRequestView;
pub use self::merge_requests::MergeRequests;
pub use self::merge_requests::MergeRequestsBuilder;
pub use self::rebase::RebaseMergeRequest;
pub use self::rebase::RebaseMergeRequestBuilder;
pub use self::resource_label_events::MergeRequestResourceLabelEvents;
pub use self::resource_label_events::MergeRequestResourceLabelEventsBuilder;
pub use self::unapprove::UnapproveMergeRequest;
pub use self::unapprove::UnapproveMergeRequestBuilder;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment