Grapify the users API
Certain endpoints return different entities based on which user issues the request. Right now, I am not aware how to specify multiple entities as part of the description block of the endpoint. @rymai Do you know something about that.
## What are the relevant issue numbers?
Related to #22928
See merge request !7147
Allow `order_by` and `sort` parameters to `/api/v3/groups.json`. At
present, only ordering by name and path is supported, and the default
sort is name ascending (alphabetical order).
Add button to delete all merged branches
## What does this MR do?
It adds a button to the branches page that the user can use to delete all the branches that are already merged. This can be used to clean up all the branches that were forgotten to delete while merging MRs.
**Note**
~~This MR is WIP until MR !6408 is merged.~~
## Are there points in the code the reviewer needs to double check?
The UX of the actual "Delete merged branches" button.
## Why was this MR needed?
Fixes#21076
## Screenshots
Before:
After:
## 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 [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#21076
See merge request !6449
It adds a button to the branches page that the user can use to delete
all the branches that are already merged. This can be used to clean up
all the branches that were forgotten to delete while merging MRs.
Fixes#21076.
* upstream/master: (70 commits)
Fix routing spec for group controller
Add small improvements to constrainers and specs
Faster search
Fix broken commits search
Changed helper method to check for none on params Moved if statements around in view
API: Return 400 when creating a systemhook fails
Update non-exist group spinach test to match routing
Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2
Replace trigger with the new ID of the docs project
Refactor method name
17492 Update link color for more accessible contrast
Fixed todos empty state when filtering
Refactor namespace regex
implements reset incoming email token on issues modal and account page, reactivates all tests and writes more tests for it
Use separate email-friendly token for incoming email and let incoming email token be reset
Use the Gitlab Workhorse HTTP header in the admin dashboard
Refactor project routing
Fix 404 when visit /projects page
Rewritten spinach git_blame tests to rspec feature tests
Add tests for project#index routing
...
* upstream/master: (74 commits)
Fetch locals to avoid undefined method/local error
Remove author according to the document
Simplify implementation of entity serializers
Add documentation for the "Only allow merge requests to be merged if all discussions are resolved" feature
Complete and improve specs
Add setting to only allow merge requests to be merged when all discussions are resolved
Apply `*_params_ce + *_params_ee` pattern to MergeRequestsController
Add tests for deployment and environment entitites
Add tests for serialization entities, add user entity
Only skip group when it's actually a group in the "Share with group" select
Fix: Todos Filter Shows All Users
Fix: Guest sees some repository details and gets 404
Move shared params to a helper
GrapeDSL for project hooks
Update commits.scss
updated styling commit SHA on branches page + added to changelog
change build list height to show 6,5 builds + improve padding of list, with first/last child selectors
Refine build entity tests a little
Expose commit author if author exists
Ignore builds directory from eslint
...
* upstream/master: (23 commits)
Clarify the author field for the changelog documentation
Add and update .gitignore & .gitlab-ci.yml templates for 8.14
Update "Installation from source" guide for 8.14.0
Add CHANGELOG entries for latest patches
Merge branch 'fix/import-export-symlink-vulnerability' into 'security'
Merge branch 'fix/import-projectmember-security' into 'security'
Use stubs instead of modifying global states
Add changelog instructions to CHANGELOG.md
Try not to include anything globally!
Update help banner for bin/changelog
Update docs and test description
Update docs and unexpose token
Initialize form validation on new group form.
Unchange username_validator.
Move snake_case to camelCase.
Change show-gl-field-errors to gl-show-field-errors
Fix changelog.
List gl_field_error as gl_field_errors dep.
Break out GlFieldError into separate file.
Add gl field errors to group name edit form.
...
* upstream/master: (26 commits)
Add a `--force` option to bin/changelog
Update examples in changelog docs to use single quotes around title
Use the server's base URL without relative URL part when creating links in JIRA
Make ESLint ignore instrumented files for coverage analysis (!7236)
Check that JavaScript file names match convention (!7238)
Removed z-index for filters on issue boards
GitLab 8.13 not 13
Replace MR Description Format links
Fix gdb backtrace command
Update gitlab.yml.example
remove extra spaces from app/workers/post_receive.rb
Add Rake task to create/repair GitLab Shell hooks symlinks
Added guide for upgrading Postgres using Slony
Ensure hook tokens are write-only in the API
Add support for token attr in project hooks API
Add a CHANGELOG entry
Fix edit button wiki
Updated Sortable JS plugin
Allow owners to fetch source code in CI builds
fixes milestone dropdown not select issue
...
Rémy Coutable
Robert Schilling
Z.J. van de Weg
Robert Speicher
Luis Alonso Chavez Armendariz
Douwe Maan
Ruben Davila
Valery Sizov
Achilleas Pipinellis
Ido Leibovich
Robert Speicher
Sean McGivern
Sean McGivern
Douwe Maan
Bernhard Häussner
Rebeca Méndez
Toon Claes
Yatish Mehta
Lin Jen-Shin
Borja Aparicio
Rares Sfirlogea
Rodolfo Santos
Nick Thomas
Zeger-Jan van de Weg