mirror of
https://github.com/harness/drone.git
synced 2025-05-05 14:12:36 +08:00
c827fa5e66
This change is fixing a few things on both UI and backend side: - update webhook creation screen to default to enable ssl verification (secure by default should always be the move) - fix pr/compare commit listing to show correct diffs the head branch is ahead of the base branch (NOTE: THIS ONLY SHOWS THE LATEST 20 COMMITS - NO PAGINATION ADDED) - fix merge commit message to contain the correct head branch, source repo path and pr numbers (similar'ish to github)
36 lines
1.0 KiB
Protocol Buffer
36 lines
1.0 KiB
Protocol Buffer
syntax = "proto3";
|
|
package rpc;
|
|
|
|
option go_package = "github.com/harness/gitness/gitrpc/rpc";
|
|
|
|
import "shared.proto";
|
|
|
|
// DiffService is a service which provides RPCs to inspect differences
|
|
// introduced between a set of commits.
|
|
service MergeService {
|
|
rpc MergeBranch(MergeBranchRequest) returns (MergeBranchResponse) {}
|
|
}
|
|
|
|
|
|
message MergeBranchRequest {
|
|
WriteRequest base = 1;
|
|
// head_branch is the source branch we want to merge
|
|
string head_branch = 2;
|
|
// base_branch is the branch into which the given commit shall be merged and whose
|
|
// reference is going to be updated.
|
|
string base_branch = 3;
|
|
// title is the title to use for the merge commit.
|
|
string title = 4;
|
|
// message is the message to use for the merge commit.
|
|
string message = 5;
|
|
// force merge
|
|
bool force = 6;
|
|
// delete branch after merge
|
|
bool delete_head_branch = 7;
|
|
}
|
|
|
|
// This comment is left unintentionally blank.
|
|
message MergeBranchResponse {
|
|
// The merge commit the branch will be updated to. The caller can still abort the merge.
|
|
string commit_id = 1;
|
|
} |