diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-09-06 12:36:20 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-09-06 12:36:20 +0000 |
| commit | c61ebedaee2d1de76c961f54ca5f6b5805fcbe06 (patch) | |
| tree | d09fec4271255ab3a1d9683a65faedc38f796df1 /CHANGELOG | |
| parent | 80e575af523f49d314dc83e02989115193b9ab64 (diff) | |
| parent | 7f0400398d7a09fd6eb35e8058c93ab693c0c527 (diff) | |
| download | gitlab-ce-c61ebedaee2d1de76c961f54ca5f6b5805fcbe06.tar.gz | |
Merge branch '19814-regression-snippet-pagination-on-user-page-leads-to-raw-json-instead-of-normal-webpage' into 'master'
12508-gitlab-ui-enhancement-proposals
Fix pagination on user snippets page
## What does this MR do?
Copy the pagination code from projects -> snippets on a user's profile page.
## Are there points in the code the reviewer needs to double check?
Don't think so.
## Why was this MR needed?
It was a bug!
## Screenshots (if relevant)
(I set the pagination to two per page for this, because I'm lazy.)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [x] 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 #19814.
See merge request !6179
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index d06b782f850..07b6e1298e4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,7 @@ v 8.12.0 (unreleased) - Add font color contrast to external label in admin area (ClemMakesApps) - Change logo animation to CSS (ClemMakesApps) - Instructions for enabling Git packfile bitmaps !6104 + - Fix pagination on user snippets page - 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) |