diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-07-26 22:07:15 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-07-26 22:07:15 +0000 |
| commit | 95efb6f1163b7c2c40d03ddd834016905fc45b50 (patch) | |
| tree | 6208c2482149bd5215903af6271064be26d15875 /spec/models/project_team_spec.rb | |
| parent | 74e17ed9eda95646d8defd495962be9dd3771eac (diff) | |
| parent | ef8d9c269a8383ba2e3766b13b44b655e0588609 (diff) | |
| download | gitlab-ce-95efb6f1163b7c2c40d03ddd834016905fc45b50.tar.gz | |
Merge branch 'feature/profile-requests-conditionally' into 'master'
Return request profiling info when a header is passed
## What does this MR do?
It allows returning profiling info (instead of actual content) when a certain header is passed
## Why was this MR needed?
To facilitate having a performance overview of certain requests.
## What are the relevant issue numbers?
https://gitlab.com/gitlab-com/infrastructure/issues/211
## Does this MR meet the acceptance criteria?
- [x] [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 !5281
Diffstat (limited to 'spec/models/project_team_spec.rb')
0 files changed, 0 insertions, 0 deletions