diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2016-12-07 02:04:40 +0300 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2016-12-07 02:04:40 +0300 |
| commit | 73a066c216815f6b4faf9b186b917c3486b6d6e0 (patch) | |
| tree | 264d2722344d8ba7c1b6774fcf3ad38911ea8b9d /spec | |
| parent | 180f87cab7c530852c049e130e9297267e006010 (diff) | |
| parent | 51a921baf90be2a6654990b9b7d062f4c613a64b (diff) | |
Merge branch 'cleanup-7180' into 'master'
A simpler implementation of finding a merge request
## What does this MR do?
This cleans up some code in the issues API as discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7180#note_19501743
The helper method `merge_request_for_resolving_discussions` was no longer needed as it was only used once. That made it possible to simplify the implementation.
## Does this MR meet the acceptance criteria?
- [x] ~~[Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
!7180
See merge request !7955
Diffstat (limited to 'spec')
0 files changed, 0 insertions, 0 deletions