diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-09-01 17:49:36 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-09-01 17:49:36 +0300 |
| commit | ae439a62cca06fdc719d53dd32e7235cf219c3c7 (patch) | |
| tree | 44d2f71b607f3cb86c522ac6673a9332fb538422 /CHANGELOG | |
| parent | 3e11bc95a56bec7b86468a72627e621a41fc087b (diff) | |
| parent | 9c3db830c033750c19197fe6a3f15a7705e2aa3b (diff) | |
Merge branch 'merge-request-sha-info' into 'master'
Merge request sha info
## What does this MR do?
Exposes `sha` and `merge_commit_sha` items in `MergeRequest` API endpoint data.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
It's useful information.
## What are the relevant issue numbers?
Closes #20456.
## Screenshots (if relevant)
N/A
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5966
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 39aec111f37..227f4e97dfe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ v 8.12.0 (unreleased) - Change merge_error column from string to text type - Reduce contributions calendar data payload (ClemMakesApps) - Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel) + - Expose `sha` and `merge_commit_sha` in merge request API (Ben Boeckel) - Set path for all JavaScript cookies to honor GitLab's subdirectory setting !5627 (Mike Greiling) - Fix bug where pagination is still displayed despite all todos marked as done (ClemMakesApps) - Shorten task status phrase (ClemMakesApps) |