summaryrefslogtreecommitdiff
path: root/app/controllers/projects/application_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-09-01 14:49:36 +0000
committerDouwe Maan <douwe@gitlab.com>2016-09-01 14:49:36 +0000
commitae439a62cca06fdc719d53dd32e7235cf219c3c7 (patch)
tree44d2f71b607f3cb86c522ac6673a9332fb538422 /app/controllers/projects/application_controller.rb
parent3e11bc95a56bec7b86468a72627e621a41fc087b (diff)
parent9c3db830c033750c19197fe6a3f15a7705e2aa3b (diff)
downloadgitlab-ce-ae439a62cca06fdc719d53dd32e7235cf219c3c7.tar.gz
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 'app/controllers/projects/application_controller.rb')
0 files changed, 0 insertions, 0 deletions