summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-gitaly-read-write-check' into 'master'Nick Thomas2018-06-273-179/+22
|\
| * Gitaly metrics check for read/writeabilityZeger-Jan van de Weg2018-06-273-179/+22
* | Merge branch 'gitaly-tree-entry-dot-dot' into 'master'Sean McGivern2018-06-272-29/+19
|\ \ | |/ |/|
| * Client-side fix for Gitaly TreeEntry buggitaly-tree-entry-dot-dotJacob Vosmaer2018-06-262-29/+19
* | Merge branch 'ce-update-branch-client-preparation' into 'master'Robert Speicher2018-06-261-2/+5
|\ \
| * | Move git calls for `Repository#update_branch` inside Gitlab::Gitce-update-branch-client-preparationAlejandro Rodríguez2018-06-251-2/+5
| |/
* | Merge branch 'dm-branch-api-can-push-fix' into 'master'Robert Speicher2018-06-261-3/+5
|\ \
| * | Fix branch API can_push attribute and add specsdm-branch-api-can-push-fixDouwe Maan2018-06-251-3/+5
* | | Merge branch 'add-rename-column-background-helper' into 'master'Yorick Peterse2018-06-264-44/+161
|\ \ \
| * | | Add a helper to rename a column using a background migrationSean McGivern2018-06-264-44/+161
| | |/ | |/|
* | | Merge branch 'gitaly-backup-opt-out' into 'master'Douwe Maan2018-06-261-4/+4
|\ \ \
| * | | Move repo backup RPC's to opt-outgitaly-backup-opt-outJacob Vosmaer2018-06-251-4/+4
* | | | Merge branch '48269-wiki-page-returns-error-code-502' into 'master'Douwe Maan2018-06-261-2/+4
|\ \ \ \
| * | | | Fix performance bottleneck when rendering large wiki pagesSean McGivern2018-06-261-2/+4
| | |/ / | |/| |
* | | | Rails5 fix arel from in mysql_median_datetime_sqlJasper Maes2018-06-261-1/+7
|/ / /
* | | Merge remote-tracking branch 'dev/master'Alessio Caiazza2018-06-252-2/+3
|\ \ \
| * \ \ Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master'Alessio Caiazza2018-06-251-1/+1
| |\ \ \
| | * | | Fix xss for Markdown elements where [[_TOC_]] is enabledMark Chao2018-06-161-1/+1
| * | | | Merge branch 'security-fj-bumping-sanitize-gem' into 'master'Alessio Caiazza2018-06-251-1/+2
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into 'security-fj-bumping-sanitize-gem'Douwe Maan2018-06-187-156/+39
| | |\ \ \ \
| | * | | | | Whitelist text-align property for th and tdDouwe Maan2018-06-181-1/+2
* | | | | | | Honor saml assurance level to allow 2FA bypassingRoger Rüttimann2018-06-254-0/+27
* | | | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master'Douwe Maan2018-06-251-10/+1
|\ \ \ \ \ \ \
| * | | | | | | Moves another RPC to mandatoryZeger-Jan van de Weg2018-06-251-10/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'zj-is-anchestor' into 'master'Douwe Maan2018-06-252-91/+3
|\ \ \ \ \ \ \
| * | | | | | | Update remote happens through Gitaly onlyZeger-Jan van de Weg2018-06-251-75/+2
| * | | | | | | Anchestor check is Gitaly only nowZeger-Jan van de Weg2018-06-251-16/+1
| |/ / / / / /
* | | | | | | Merge branch 'zj-write-config' into 'master'Douwe Maan2018-06-251-9/+3
|\ \ \ \ \ \ \
| * | | | | | | Write Config is mandatoryZeger-Jan van de Weg2018-06-251-9/+3
| |/ / / / / /
* | | | | | | Merge branch 'zj-missing-part-linguist' into 'master'Douwe Maan2018-06-251-23/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove feature gatezj-missing-part-linguistZeger-Jan van de Weg2018-06-251-23/+2
| |/ / / / / /
* | | | | | | Merge branch 'zj-tree-entry-mandatory' into 'master'Douwe Maan2018-06-251-87/+26
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Gitaly tree entry is mandatoryzj-tree-entry-mandatoryZeger-Jan van de Weg2018-06-251-87/+26
| |/ / / / /
* | | | | | Merge branch 'enforce-variable-value-to-be-a-string' into 'master'Grzegorz Bizon2018-06-251-0/+3
|\ \ \ \ \ \
| * | | | | | Enforce setting string as value of the CI/CD variableTomasz Maczukin2018-06-251-0/+3
* | | | | | | Merge branch 'jprovazn-rails5-mysql-datetime' into 'master'Yorick Peterse2018-06-251-0/+18
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Mysql fixes for Rails 5jprovazn-rails5-mysql-datetimeJan Provaznik2018-06-211-0/+18
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'zj-commit-raw-diffs' into 'master'Douwe Maan2018-06-221-7/+3
|\ \ \ \ \ \
| * | | | | | Raw diffs are served from Gitalyzj-commit-raw-diffsZeger-Jan van de Weg2018-06-221-7/+3
* | | | | | | Merge branch 'rs-lib-gitlab-git-gitlab_projects-parity' into 'master'Robert Speicher2018-06-221-12/+13
|\ \ \ \ \ \ \
| * | | | | | | CE-EE parity for lib/gitlab/git/gitlab_projects.rbrs-lib-gitlab-git-gitlab_projects-parityRobert Speicher2018-06-201-12/+13
* | | | | | | | Merge branch 'zj-find-ref-name' into 'master'Douwe Maan2018-06-221-11/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | FindRefName RPC now mandatoryzj-find-ref-nameZeger-Jan van de Weg2018-06-221-11/+1
* | | | | | | | | Merge branch 'bjk/48176_ruby_gc' into 'master'Yorick Peterse2018-06-221-12/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cleanup ruby sampler metricsbjk/48176_ruby_gcBen Kochie2018-06-221-12/+14
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-repository-size' into 'master'Douwe Maan2018-06-221-15/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Repository size is Gitaly onlyzj-repository-sizeZeger-Jan van de Weg2018-06-221-15/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'docs-request-cache' into 'master'Sean McGivern2018-06-221-36/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add docs for RequestCache, moved from commentsLin Jen-Shin2018-06-221-36/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Git ls files is Gitaly only nowZeger-Jan van de Weg2018-06-221-34/+1
| |/ / / / / / |/| | | | | |