Skip to content

G
gitlab-ce
Commit 36cb8d58 authored by Lukas Eipert's avatar Lukas Eipert
Browse files
Options

Resove conflicts in doc/api/merge_requests.md

parent e9c81f24
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 36 deletions
doc/api/merge_requests.md
View file @ 36cb8d58
...@@ -117,12 +117,8 @@ Parameters: ...@@ -117,12 +117,8 @@ Parameters:
"human_time_estimate": null, "human_time_estimate": null,
"human_total_time_spent": null "human_total_time_spent": null
}, },
<<<<<<< HEAD
"squash": false, "squash": false,
"approvals_before_merge": null "approvals_before_merge": null
=======
"squash": false
>>>>>>> upstream/master
} }
] ]
``` ```
...@@ -245,12 +241,8 @@ Parameters: ...@@ -245,12 +241,8 @@ Parameters:
"human_time_estimate": null, "human_time_estimate": null,
"human_total_time_spent": null "human_total_time_spent": null
}, },
<<<<<<< HEAD
"squash": false, "squash": false,
"approvals_before_merge": null "approvals_before_merge": null
=======
"squash": false
>>>>>>> upstream/master
} }
] ]
``` ```
...@@ -361,12 +353,8 @@ Parameters: ...@@ -361,12 +353,8 @@ Parameters:
"human_time_estimate": null, "human_time_estimate": null,
"human_total_time_spent": null "human_total_time_spent": null
}, },
<<<<<<< HEAD
"squash": false, "squash": false,
"approvals_before_merge": null "approvals_before_merge": null
=======
"squash": false
>>>>>>> upstream/master
} }
] ]
``` ```
...@@ -809,12 +797,8 @@ order for it to take effect: ...@@ -809,12 +797,8 @@ order for it to take effect:
"head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f", "head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
"start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00" "start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00"
}, },
<<<<<<< HEAD
"diverged_commits_count": 2, "diverged_commits_count": 2,
"approvals_before_merge": null "approvals_before_merge": null
=======
"diverged_commits_count": 2
>>>>>>> upstream/master
} }
``` ```
...@@ -941,12 +925,8 @@ Must include at least one non-required attribute from above. ...@@ -941,12 +925,8 @@ Must include at least one non-required attribute from above.
"head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f", "head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
"start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00" "start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00"
}, },
<<<<<<< HEAD
"diverged_commits_count": 2, "diverged_commits_count": 2,
"approvals_before_merge": null "approvals_before_merge": null
=======
"diverged_commits_count": 2
>>>>>>> upstream/master
} }
``` ```
...@@ -1089,12 +1069,8 @@ Parameters: ...@@ -1089,12 +1069,8 @@ Parameters:
"head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f", "head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
"start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00" "start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00"
}, },
<<<<<<< HEAD
"diverged_commits_count": 2, "diverged_commits_count": 2,
"approvals_before_merge": null "approvals_before_merge": null
=======
"diverged_commits_count": 2
>>>>>>> upstream/master
} }
``` ```
...@@ -1209,12 +1185,8 @@ Parameters: ...@@ -1209,12 +1185,8 @@ Parameters:
"head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f", "head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
"start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00" "start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00"
}, },
<<<<<<< HEAD
"diverged_commits_count": 2, "diverged_commits_count": 2,
"approvals_before_merge": null "approvals_before_merge": null
=======
"diverged_commits_count": 2
>>>>>>> upstream/master
} }
``` ```
...@@ -1413,12 +1385,8 @@ Example response: ...@@ -1413,12 +1385,8 @@ Example response:
"head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f", "head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
"start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00" "start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00"
}, },
<<<<<<< HEAD
"diverged_commits_count": 2, "diverged_commits_count": 2,
"approvals_before_merge": null "approvals_before_merge": null
=======
"diverged_commits_count": 2
>>>>>>> upstream/master
} }
``` ```
...@@ -1539,12 +1507,8 @@ Example response: ...@@ -1539,12 +1507,8 @@ Example response:
"head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f", "head_sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
"start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00" "start_sha": "c380d3acebd181f13629a25d2e2acca46ffe1e00"
}, },
<<<<<<< HEAD
"diverged_commits_count": 2, "diverged_commits_count": 2,
"approvals_before_merge": null "approvals_before_merge": null
=======
"diverged_commits_count": 2
>>>>>>> upstream/master
} }
``` ```
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7