diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-03 22:04:50 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-08-03 22:04:50 +0000 |
| commit | 8890376f0f72f713a7530bd7989e71442c69dc91 (patch) | |
| tree | 59846f103b348fc39f76798533cfd0a933526a94 /.gitlab-ci.yml | |
| parent | 6a9283600cd4a11b97fe26772e68095d8dc854bd (diff) | |
| parent | 631f59d4e7f449c59735cd7eab25cf407e06d5d8 (diff) | |
| download | gitlab-ce-8890376f0f72f713a7530bd7989e71442c69dc91.tar.gz | |
Merge branch 'use-raw-diffs-for-merge-request-diffs' into 'master'
change the API on the merge_request_diff model from diffs -> raw_diffs
## What does this MR do?
Unify diffs API
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## What are the relevant issue numbers?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- ~~[ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~[ ] API support added~~
- Tests
- ~~[ ] Added for this feature/bug~~
- [ ] 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 !5650
Diffstat (limited to '.gitlab-ci.yml')
0 files changed, 0 insertions, 0 deletions