diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-09-12 08:47:11 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-09-12 08:47:11 +0000 |
commit | 6c8516db241e20ecc678e394edbde1e618ad59ad (patch) | |
tree | 4f0ec69fb18179de97b6ffaf6726e069eddfcf8d /CHANGELOG | |
parent | 3a59efd562d22ec3148101d794d99889ccc9b82b (diff) | |
parent | 45fc8b73ed1875cc9766e5735d4411fd5c8872be (diff) | |
download | gitlab-ce-6c8516db241e20ecc678e394edbde1e618ad59ad.tar.gz |
Merge branch 'fix-api-sorting' into 'master'
Fix API issues sorting
## What does this MR do?
Fix the sorting of issues in the API.
## Are there points in the code the reviewer needs to double check?
Instead of removing the '_at' suffix manually, we could add those versions to the `Sortable` concern instead.
## Why was this MR needed?
There were a couple of bugs:
* The global and project-specific issues endpoints wouldn't sort at all.
* Group sorting would work, but only if you applied two undocumented workarounds:
* Always pass both `order_by` and `sort` (both are optional, so only one should be needed to change ordering).
* Instead of passing `created_at` or `updated_at`, you needed to pass `created` or `updated`.
This makes the API implementation match the docs.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [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 you do - 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?
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/983.
See merge request !6281
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 89c880467cd..885279368ea 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ v 8.12.0 (unreleased) - Change logo animation to CSS (ClemMakesApps) - Instructions for enabling Git packfile bitmaps !6104 - Fix pagination on user snippets page + - Fix sorting of issues in API - Escape search term before passing it to Regexp.new !6241 (winniehell) - Fix pinned sidebar behavior in smaller viewports !6169 - Change merge_error column from string to text type |