summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-076-154/+265
|\
| * Make PrometheusTextFormat return proper output terminated with '\n'Pawel Chojnacki2017-06-021-1/+1
| * Add missing trailing newlinesPawel Chojnacki2017-06-023-3/+3
| * Fix circular dependency condition with `current_application_settings`Pawel Chojnacki2017-06-021-14/+21
| * Split the metrics implementation to separate modules for Influx and PrometheusPawel Chojnacki2017-06-024-219/+235
| * Add prometheus text formatterPawel Chojnacki2017-06-022-10/+1
| * Move Prometheus presentation logic to PrometheusTextPawel Chojnacki2017-06-023-17/+45
| * Add tests for metrics behaviorPawel Chojnacki2017-06-021-7/+9
| * remove prometheus samplerPawel Chojnacki2017-06-021-51/+0
| * Split metrics from health controller into metrics controllerPawel Chojnacki2017-06-021-22/+0
| * Prometheus settingsPawel Chojnacki2017-06-022-10/+11
| * Prometheus metrics first passPawel Chojnacki2017-06-023-3/+142
* | Merge branch '32995-issue-contents-dynamically-replaced-with-stale-version-af...Sean McGivern2017-06-072-6/+7
|\ \
| * | Fix incorrect ETag cache key when relative instance URL is usedAdam Niedzielski2017-06-072-6/+7
* | | Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-073-2/+6
|\ \ \
| * | | Support descriptions for snippetsJarka Kadlecova2017-05-313-2/+6
* | | | Merge branch 'zj-read-registry-pat' into 'master'Kamil Trzciński2017-06-072-7/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix test failureszj-read-registry-patZ.J. van de Weg2017-06-061-16/+23
| * | | Create read_registry scope with JWT authZ.J. van de Weg2017-06-052-14/+32
* | | | Merge branch '2563-backport-ee1942' into 'master'Grzegorz Bizon2017-06-072-7/+1
|\ \ \ \
| * | | | Backport https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1942Lin Jen-Shin2017-06-062-7/+1
* | | | | redesign caching of application settingsPaul Charlton2017-06-061-19/+35
* | | | | Fix binary encoding error on MR diffsJames Lopez2017-06-061-1/+1
* | | | | Introduce optimistic locking support via optional parameter last_commit_id on...Roman Safronov2017-06-061-2/+9
* | | | | Accept a username for User-level Events APIMark Fletcher2017-06-061-2/+2
* | | | | Introduce an Events APIMark Fletcher2017-06-064-31/+87
|/ / / /
* | | | Merge branch '29690-rotate-otp-key-base' into 'master'Brian Neel2017-06-062-0/+103
|\ \ \ \
| * | | | Add a Rake task to aid in rotating otp_key_baseNick Thomas2017-06-052-0/+103
* | | | | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'Douwe Maan2017-06-051-1/+1
|\ \ \ \ \
| * | | | | backports changed import logic from pull mirroring feature into CETiago Botelho2017-06-051-1/+1
* | | | | | Merge branch 'mk-fix-git-over-http-rejections' into 'master'Douwe Maan2017-06-057-78/+148
|\ \ \ \ \ \
| * | | | | | Remove unnecessary variablemk-fix-git-over-http-rejectionsMichael Kozono2017-06-051-3/+1
| * | | | | | Extract and memoize `user_access`Michael Kozono2017-06-051-6/+9
| * | | | | | Remove GitAccessStatus (no longer needed)Michael Kozono2017-06-054-26/+9
| * | | | | | Refactor construction of responseMichael Kozono2017-06-052-14/+22
| * | | | | | Refactor to remove a special caseMichael Kozono2017-06-052-7/+14
| * | | | | | Fix would-be regressionMichael Kozono2017-06-051-3/+1
| * | | | | | Clarify error messagesMichael Kozono2017-06-051-8/+26
| * | | | | | Refactor to let GitAccess errors bubble upMichael Kozono2017-06-055-45/+40
| * | | | | | Move CI access logic into GitAccessMichael Kozono2017-06-051-3/+17
| * | | | | | Check disabled commands in GitAccess insteadMichael Kozono2017-06-051-1/+26
| * | | | | | Fix Git over HTTP specMichael Kozono2017-06-053-16/+37
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'added_chinese_for_i18n' into 'master'Douwe Maan2017-06-051-1/+4
|\ \ \ \ \ \
| * | | | | | Update i18n.rb Indent styleHuang Tao2017-06-051-3/+3
| * | | | | | Add translation zh_TW to I18N黄涛2017-06-051-1/+2
| * | | | | | Add translation zh_HK to I18N黄涛2017-06-051-1/+2
| * | | | | | Change the language name zh to zh_CN黄涛2017-06-051-1/+1
| * | | | | | Update i18n.rb stylehtve2017-06-051-1/+1
| * | | | | | added Simplified Chinese to I18N黄涛2017-06-051-1/+2
* | | | | | | Merge branch '28694-hard-delete-user-from-admin-panel' into 'master'Douwe Maan2017-06-051-1/+1
|\ \ \ \ \ \ \
View Lorry Controller Status