summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Check ability ability before proceeding with project specific checksTiago Botelho2018-02-061-18/+23
| * | | | | | | | | | | Moves project creationg to git access check for git pushTiago Botelho2018-02-068-66/+78
| * | | | | | | | | | | Adds documentation for the featureTiago Botelho2018-02-061-2/+6
| * | | | | | | | | | | Abstracts ProjectMoved and ProjectCreated into a BaseProjectTiago Botelho2018-02-067-92/+79
| * | | | | | | | | | | Move new project on push logic to a serviceTiago Botelho2018-02-066-52/+40
| * | | | | | | | | | | Add specsTiago Botelho2018-02-064-19/+20
| * | | | | | | | | | | Adds remote messsage when project is created in a push over SSH or HTTPTiago Botelho2018-02-065-20/+112
| * | | | | | | | | | | Adds option to push over SSH to create a new projectTiago Botelho2018-02-062-2/+15
| * | | | | | | | | | | Adds option to push over HTTP to create a new projectTiago Botelho2018-02-061-5/+24
* | | | | | | | | | | | Merge branch 'dm-git-hook-popen' into 'master'Stan Hu2018-02-061-8/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Only set cwd on the newly spawned process, instead of the current oneDouwe Maan2018-02-061-8/+14
* | | | | | | | | | | | Merge branch 'dm-route-path-validation' into 'master'Sean McGivern2018-02-063-14/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Validate User username only on Namespace, and bubble up appropriatelyDouwe Maan2018-02-063-14/+2
* | | | | | | | | | | | Merge branch 'dm-sidekiq-memory-killer-getcwd' into 'master'Stan Hu2018-02-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status