summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bvl-errors-in-static-analysis' into 'master'Sean McGivern2018-06-202-13/+30
|\
| * More verbose errors in static-analysisBob Van Landuyt2018-06-202-13/+30
* | Merge branch 'zj-can-be-merged' into 'master'Douwe Maan2018-06-201-15/+2
|\ \
| * | Move mergablility check to Gitalyzj-can-be-mergedZeger-Jan van de Weg2018-06-201-15/+2
* | | Fix: Serve favicon image always from the main GitLab domain to avoid issues w...Alexis Reigel2018-06-201-5/+15
| |/ |/|
* | Resolve "Unable to install Prometheus on Clusters: 'Error: Chart incompatible...Mayra Cabrera2018-06-201-3/+8
* | Merge branch 'use-backup-custom-hooks-gitaly' into 'master'Douwe Maan2018-06-202-64/+108
|\ \
| * | Move backup custom hooks up a leveluse-backup-custom-hooks-gitalyAhmad Hassan2018-06-201-4/+2
| * | Output done for wiki and repoAhmad Hassan2018-06-191-14/+3
| * | Migrate repo backup to gitalyAhmad Hassan2018-06-152-54/+111
* | | More gitaly disk access blocksJacob Vosmaer (GitLab)2018-06-202-0/+2
* | | Merge branch 'ce-5024-filename-search' into 'master'Sean McGivern2018-06-203-5/+90
|\ \ \
| * | | Implement filtering by filename on code searchce-5024-filename-searchMario de la Ossa2018-06-193-5/+90
* | | | Merge branch '48105-git-version-detection-using-gitaly' into 'master'Sean McGivern2018-06-201-1/+1
|\ \ \ \
| * | | | Use gitaly to figure out git version for usage ping48105-git-version-detection-using-gitalyBalasankar "Balu" C2018-06-191-1/+1
* | | | | Merge branch 'zj-lfs-pointers' into 'master'Douwe Maan2018-06-201-58/+2
|\ \ \ \ \
| * | | | | LFS changes are detected by Gitalyzj-lfs-pointersZeger-Jan van de Weg2018-06-191-58/+2
* | | | | | Merge branch 'dm-branch-api-can-push' into 'master'Robert Speicher2018-06-191-0/+4
|\ \ \ \ \ \
| * | | | | | Expose whether current user can push into a branch on branches APIdm-branch-api-can-pushDouwe Maan2018-06-181-0/+4
* | | | | | | Merge branch 'zj-force-push-opt-out' into 'master'Douwe Maan2018-06-193-25/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Force push is handled by Gitaly nowzj-force-push-opt-outZeger-Jan van de Weg2018-06-193-25/+4
* | | | | | | Merge branch 'zj-fork-mandatory' into 'master'Douwe Maan2018-06-191-15/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Move forking to Gitalyzj-fork-mandatoryZeger-Jan van de Weg2018-06-191-15/+2
* | | | | | | Merge branch 'zj-counting-commits' into 'master'Douwe Maan2018-06-191-70/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Counting commits is done by Gitalyzj-counting-commitsZeger-Jan van de Weg2018-06-191-70/+13
| |/ / / / /
* | | | | | Merge branch 'sh-optimize-locks-check-ce' into 'master'Sean McGivern2018-06-191-1/+1
|\ \ \ \ \ \
| * | | | | | Eliminate N+1 queries in LFS file locks checks during a pushsh-optimize-locks-check-ceStan Hu2018-06-181-1/+1
| |/ / / / /
* | | | | | Merge branch 'more-group-api-sorting-options' into 'master'Douwe Maan2018-06-191-2/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add id as second sort parameter for group sort by nameMarko, Peter2018-06-181-1/+3
| * | | | | Add id group api sorting optionMarko, Peter2018-06-121-1/+1
* | | | | | Merge branch 'zj-gitaly-squash' into 'master'Douwe Maan2018-06-191-27/+4
|\ \ \ \ \ \
| * | | | | | Rebase and Squash in progress are Gitaly onlyZeger-Jan van de Weg2018-06-191-27/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'zj-info-attributes' into 'master'Douwe Maan2018-06-191-15/+1
|\ \ \ \ \ \
| * | | | | | Move info attributes to mandatoryZeger-Jan van de Weg2018-06-191-15/+1
| |/ / / / /
* | | | | | Merge branch 'zj-commit-count' into 'master'Douwe Maan2018-06-191-18/+2
|\ \ \ \ \ \
| * | | | | | Move count commit to mandatoryZeger-Jan van de Weg2018-06-191-18/+2
| |/ / / / /
* | | | | | License detection happens soley through Gitaly nowZeger-Jan van de Weg2018-06-191-12/+2
|/ / / / /
* | | | | Merge branch 'bvl-i18n-validation' into 'master'Rémy Coutable2018-06-186-53/+158
|\ \ \ \ \
| * | | | | Correctly translate all forms in testsbvl-i18n-validationBob Van Landuyt2018-06-154-24/+60
| * | | | | Add Polish as a supported languageBob Van Landuyt2018-06-151-1/+2
| * | | | | Validate if changed translations are checked inBob Van Landuyt2018-06-152-0/+27
| * | | | | Validate PO-variable usage in message idsBob Van Landuyt2018-06-151-0/+4
| * | | | | Forbids combining named and unnamed variables in `gitlab.pot`Bob Van Landuyt2018-06-152-41/+78
* | | | | | Merge branch 'dm-blockquote-trailing-whitespace' into 'master'Sean McGivern2018-06-181-6/+6
|\ \ \ \ \ \
| * | | | | | Allow trailing whitespace on blockquote fence linesDouwe Maan2018-06-181-6/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'dm-favicon-redirect' into 'master'Sean McGivern2018-06-181-0/+1
|\ \ \ \ \ \
| * | | | | | Redirect favicon.(png|ico) to actual favicon asset or uploaddm-favicon-redirectDouwe Maan2018-06-181-0/+1
| |/ / / / /
* | | | | | Merge branch 'rails5-fix-db-check' into 'master'Yorick Peterse2018-06-181-1/+1
|\ \ \ \ \ \
| * | | | | | Rails5 fix connection execute return integer instead of stringJasper Maes2018-06-151-1/+1
* | | | | | | Merge branch 'blackst0ne-rails5-invalid-single-table-inheritance-type-group-i...Yorick Peterse2018-06-181-0/+1
|\ \ \ \ \ \ \