summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '29497-pages-custom-domain-dns-verification' into 'security-10-5'Robert Speicher2018-02-201-0/+8
* Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'Sean McGivern2018-02-191-0/+1
* Merge branch 'fj-fixed-bug-17054' into 'master'Douwe Maan2018-02-191-1/+1
* Merge branch 'fj-37528-error-after-disabling-ldap' into 'master'Douwe Maan2018-02-192-2/+8
* Merge branch 'mk-fix-no-untracked-upload-files-error' into 'master'Douwe Maan2018-02-151-2/+11
* Merge branch '42934-search-api-fix' into 'master'10-5-stable-prepare-rc6Sean McGivern2018-02-145-13/+14
* Merge branch 'ac/4878-fix-attachments-ext' into 'master'Nick Thomas2018-02-141-4/+4
* Merge branch 'remove_ldap_person_validation' into 'master'Stan Hu2018-02-141-15/+0
* Merge branch 'jivl-update-katex' into 'master'Clement Ho2018-02-141-2/+0
* Merge branch 'whitelisting' into 'master'Yorick Peterse2018-02-131-7/+1
* Merge branch 'sh-disable-query-limiter' into 'master'Ian Baum2018-02-121-1/+1
* Merge branch 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading...10-5-stable-prepare-rc4Ian Baum2018-02-121-22/+6
* Merge branch '42937-search-api-fix' into 'master'Grzegorz Bizon2018-02-121-4/+4
* Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'Yorick Peterse2018-02-121-4/+11
* Merge branch 'rs-pick-security' into 'master'Stan Hu2018-02-093-14/+24
* Migrate Git::Blob.batch to GitalyAhmad Sherif2018-02-083-5/+74
* Merge branch 'fix/cache-gitaly-find-commits' into 'master'Sean McGivern2018-02-071-8/+30
|\
| * Cache Gitaly FindCommit RPC responsefix/cache-gitaly-find-commitsAhmad Sherif2018-02-071-8/+30
* | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-073-26/+29
|\ \
| * | Catch json parsing error as PrometheusErrorpawel/connect_to_prometheus_through_proxy-30480Pawel Chojnacki2018-02-071-0/+2
| * | Make prometheus service querying approach much nicer wrt to arity and default...Pawel Chojnacki2018-02-071-1/+1
| * | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-06102-339/+871
| |\ \
| * \ \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-3148-477/+872
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-2969-301/+1153
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-17140-605/+2199
| |\ \ \ \ \
| * | | | | | Cleanup PrometheusService testsPawel Chojnacki2018-01-041-12/+14
| * | | | | | Cleanup implementation and add cluster finding testsPawel Chojnacki2018-01-041-1/+1
| * | | | | | Fix prometheus client testsPawel Chojnacki2018-01-041-4/+13
| * | | | | | Add test checking if prometheus integration is enabled after prometheus is in...Pawel Chojnacki2018-01-042-15/+13
| * | | | | | Move client creation to Prometheus Application, manufacture proper rest clientPawel Chojnacki2018-01-021-10/+4
| * | | | | | wipPawel Chojnacki2018-01-023-21/+19
* | | | | | | Removing gitaly flagsFrancisco Javier López2018-02-071-4/+2
* | | | | | | Merge branch 'zj-refs-hash' into 'master'Sean McGivern2018-02-072-24/+21
|\ \ \ \ \ \ \
| * | | | | | | Don't use rugged in Repository#refs_hashZeger-Jan van de Weg2018-02-072-24/+21
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'rd-35856-backport-lfs-file-locking-api' into 'master'Sean McGivern2018-02-073-1/+91
|\ \ \ \ \ \ \
| * | | | | | | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-073-1/+91
* | | | | | | | Merge branch '41763-search-api' into 'master'Sean McGivern2018-02-077-22/+151
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Small code/doc changes41763-search-apiJarka Kadlecová2018-02-071-6/+12
| * | | | | | | Return only limited pagination headers for search API endpointsJarka Kadlecová2018-02-064-10/+18
| * | | | | | | Support search in APIJarka Kadlecová2018-02-067-22/+137
* | | | | | | | Merge branch '41209-ci-linter-fails-on-gitlab-ci-blob-viewer' into 'master'Kamil Trzciński2018-02-072-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle all YAML parser exceptions in .gitlab-ci.yml (fixes #41209)41209-ci-linter-fails-on-gitlab-ci-blob-viewerDylan Griffith2018-02-072-1/+3
* | | | | | | | | Merge branch '38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-wh...Kamil Trzciński2018-02-072-20/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 38265-stuckcijobsworker-wrongly-detects-cancels-st...Matija Čupić2018-02-04113-731/+1290
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | Refactor runner attribute caching implementationMatija Čupić2018-02-041-1/+1
| * | | | | | | | | Move info update implementation to Ci::Runner modelMatija Čupić2018-01-291-26/+1
| * | | | | | | | | Update runner info on all authenticated requestsMatija Čupić2018-01-292-1/+2
| * | | | | | | | | Extend Runner API helpers with cache info storageMatija Čupić2018-01-291-5/+11
* | | | | | | | | | Merge branch '26388-push-to-create-a-new-project' into 'master'Douwe Maan2018-02-068-67/+188
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into '26388-push-to-create-a-new-project'Douwe Maan2018-02-0616-81/+176
| |\ \ \ \ \ \ \ \ \ \