summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/template-project-visibility' into 'master'Douwe Maan2018-02-141-23/+0
|\
| * Remove Gitlab::ImportExport::ProjectCreator classGeorge Tsiolis2018-02-141-23/+0
* | Merge branch '42934-search-api-fix' into 'master'Sean McGivern2018-02-143-5/+8
|\ \
| * | API - Include project in commits&blobs search resultsJarka Kadlecová2018-02-143-5/+8
* | | Merge branch 'remove_ldap_person_validation' into 'master'Stan Hu2018-02-131-15/+0
|\ \ \
| * | | Revert problematic LDAP person validation that threw exceptionsDrew Blessing2018-02-131-15/+0
* | | | Merge branch 'whitelisting' into 'master'Yorick Peterse2018-02-131-7/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove Sentry reporting for query limitingYorick Peterse2018-02-131-7/+1
* | | | Merge branch 'mk-fix-no-untracked-upload-files-error' into 'master'Douwe Maan2018-02-131-2/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Fix orphan temp table untracked_files_for_uploadsMichael Kozono2018-02-121-1/+10
| * | | Fix last batch size equals max batch size errorMichael Kozono2018-02-121-1/+1
* | | | Merge branch 'jivl-update-katex' into 'master'Clement Ho2018-02-121-2/+0
|\ \ \ \
| * \ \ \ Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-1242-250/+656
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-05175-1353/+4471
| |\ \ \ \
| * | | | | Removed the katex precompile steps from the application configurationJose Ivan Vargas2017-12-211-1/+0
| * | | | | added katex.js and load it via webpackJose Ivan Vargas2017-12-211-1/+0
* | | | | | Merge branch 'sh-disable-query-limiter' into 'master'Ian Baum2018-02-121-1/+1
|\ \ \ \ \ \
| * | | | | | Disable query limiting warnings for now on GitLab.comStan Hu2018-02-121-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'ac/4878-fix-attachments-ext' into 'master'Nick Thomas2018-02-121-4/+4
|\ \ \ \ \ \
| * | | | | | Honour workhorse provided file nameac/4878-fix-attachments-extAlessio Caiazza2018-02-121-4/+4
| |/ / / / /
* | | | | | Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-s...rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-keyRubén Dávila2018-02-121-22/+6
| |_|_|/ / |/| | | |
* | | | | Create an empty wiki when there is no wiki in the gitlab export bundleValery Sizov2018-02-122-2/+26
|/ / / /
* | | | Return a warning string if we try to encode to unsupported encodingAhmad Sherif2018-02-091-3/+3
* | | | Remove allow_n_plus_1 from Git::Repository#branches_filterAhmad Sherif2018-02-081-11/+8
* | | | Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'42861-include-external-files-in-gitlab-ci-yml-move-from-eep-to-ceYorick Peterse2018-02-081-4/+11
|\ \ \ \
| * | | | Handle uniqueness on fork_network_member creationBob Van Landuyt2018-02-081-4/+11
* | | | | Merge branch 'zj-namespace-gitaly-opt-out' into 'master'Sean McGivern2018-02-081-4/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move Namespace to Gitaly using OPT-OUTZeger-Jan van de Weg2017-12-131-4/+8
* | | | | 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-0672-309/+704
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-3128-375/+895
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-2946-237/+987
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-1786-409/+1825
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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-072-7/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
View Lorry Controller Status