summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jej/mattermost-notification-confidentiality-10-5' into 'securit...Douwe Maan2018-04-037-5/+76
* Merge branch '42028-xss-diffs' into 'security-10-5'Douwe Maan2018-04-031-2/+5
* Merge branch 'fj-15329-services-callbacks-ssrf-10-5' into 'security-10-5'Douwe Maan2018-03-165-20/+75
* Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'Robert Speicher2018-03-151-5/+11
* Merge branch 'fix-code-search-500-with-non-ascii-filename' into 'master'Nick Thomas2018-03-151-2/+2
* Merge branch '43531-500-error-searching-wiki-incompatible-character-encodings...Nick Thomas2018-03-061-1/+3
* Merge branch 'mk/fix-error-code-for-repo-does-not-exist' into 'master'Douwe Maan2018-03-061-1/+1
* Merge branch 'grpc-unavailable-restart' into 'master'Douwe Maan2018-03-063-67/+156
* Merge branch 'zj-gitaly-encoding-issue' into 'master'Robert Speicher2018-03-061-1/+1
* Convert Gitaly commit parent IDs to array as early as possibleSean McGivern2018-02-231-1/+1
* Merge branch '41619-turn-on-legacy-authorization-for-new-clusters-on-gke' int...Kamil Trzciński2018-02-231-1/+5
* Merge branch 'git-access-existence-check' into 'master'Robert Speicher2018-02-232-1/+11
* Merge branch '43424-put_all_event_metrics_behind_feature_flags' into 'master'Douwe Maan2018-02-231-2/+3
* Merge branch 'zj-branch-contains-git-message' into 'master'Douwe Maan2018-02-231-10/+16
* Merge branch 'users-autocomplete' into 'master'10-5-stable-patch-2Douwe Maan2018-02-232-2/+14
* Merge branch 'jej/avoid-slow-file-lock-checks' into 'master'Sean McGivern2018-02-232-3/+8
* Merge branch 'jej/fix-slow-lfs-object-check' into 'master'Douwe Maan2018-02-233-7/+11
* 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
|\ \ \ \ \ \ \