diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-25 14:31:25 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-25 14:31:25 +0000 |
| commit | 720d3be2c4fd4186d320694e869ccf25498edb34 (patch) | |
| tree | 174c80b942d8bdfa8bd00f561c471db5fa7a88fc /app/controllers/projects/commit_controller.rb | |
| parent | 8987257498c785e1ecf90c6cb85b9d1db06d9797 (diff) | |
| parent | 67012f4ae0c914473162d3d84d62e96dad2b3fc4 (diff) | |
| download | gitlab-ce-720d3be2c4fd4186d320694e869ccf25498edb34.tar.gz | |
Merge branch 'instrument-nokogiri' into 'master'
Instrument Nokogiri parsing methods
## What does this MR do?
This MR instruments the various parsing methods of Nokogiri.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
This allows us to see how much time is spent in Nokogiri.
## 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~~
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] 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 !5470
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
0 files changed, 0 insertions, 0 deletions