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
Showing
... | @@ -334,6 +334,8 @@ gem 'mail_room', '~> 0.8' | ... | @@ -334,6 +334,8 @@ gem 'mail_room', '~> 0.8' |
gem 'email_reply_parser', '~> 0.5.8' | gem 'email_reply_parser', '~> 0.5.8' | ||
gem 'ruby-prof', '~> 0.15.9' | |||
## CI | ## CI | ||
gem 'activerecord-session_store', '~> 1.0.0' | gem 'activerecord-session_store', '~> 1.0.0' | ||
gem 'nested_form', '~> 0.3.2' | gem 'nested_form', '~> 0.3.2' | ||
... | ... |
Please register or sign in to comment