Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'zj-gitaly-read-write-check' into 'master' | Nick Thomas | 2018-06-27 | 3 | -179/+22 |
|\ | |||||
| * | Gitaly metrics check for read/writeability | Zeger-Jan van de Weg | 2018-06-27 | 3 | -179/+22 |
* | | Merge branch 'gitaly-tree-entry-dot-dot' into 'master' | Sean McGivern | 2018-06-27 | 2 | -29/+19 |
|\ \ | |/ |/| | |||||
| * | Client-side fix for Gitaly TreeEntry buggitaly-tree-entry-dot-dot | Jacob Vosmaer | 2018-06-26 | 2 | -29/+19 |
* | | Merge branch 'ce-update-branch-client-preparation' into 'master' | Robert Speicher | 2018-06-26 | 1 | -2/+5 |
|\ \ | |||||
| * | | Move git calls for `Repository#update_branch` inside Gitlab::Gitce-update-branch-client-preparation | Alejandro RodrÃguez | 2018-06-25 | 1 | -2/+5 |
| |/ | |||||
* | | Merge branch 'dm-branch-api-can-push-fix' into 'master' | Robert Speicher | 2018-06-26 | 1 | -3/+5 |
|\ \ | |||||
| * | | Fix branch API can_push attribute and add specsdm-branch-api-can-push-fix | Douwe Maan | 2018-06-25 | 1 | -3/+5 |
* | | | Merge branch 'add-rename-column-background-helper' into 'master' | Yorick Peterse | 2018-06-26 | 4 | -44/+161 |
|\ \ \ | |||||
| * | | | Add a helper to rename a column using a background migration | Sean McGivern | 2018-06-26 | 4 | -44/+161 |
| | |/ | |/| | |||||
* | | | Merge branch 'gitaly-backup-opt-out' into 'master' | Douwe Maan | 2018-06-26 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | Move repo backup RPC's to opt-outgitaly-backup-opt-out | Jacob Vosmaer | 2018-06-25 | 1 | -4/+4 |
* | | | | Merge branch '48269-wiki-page-returns-error-code-502' into 'master' | Douwe Maan | 2018-06-26 | 1 | -2/+4 |
|\ \ \ \ | |||||
| * | | | | Fix performance bottleneck when rendering large wiki pages | Sean McGivern | 2018-06-26 | 1 | -2/+4 |
| | |/ / | |/| | | |||||
* | | | | Rails5 fix arel from in mysql_median_datetime_sql | Jasper Maes | 2018-06-26 | 1 | -1/+7 |
|/ / / | |||||
* | | | Merge remote-tracking branch 'dev/master' | Alessio Caiazza | 2018-06-25 | 2 | -2/+3 |
|\ \ \ | |||||
| * \ \ | Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix xss for Markdown elements where [[_TOC_]] is enabled | Mark Chao | 2018-06-16 | 1 | -1/+1 |
| * | | | | Merge branch 'security-fj-bumping-sanitize-gem' into 'master' | Alessio Caiazza | 2018-06-25 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into 'security-fj-bumping-sanitize-gem' | Douwe Maan | 2018-06-18 | 7 | -156/+39 |
| | |\ \ \ \ | |||||
| | * | | | | | Whitelist text-align property for th and td | Douwe Maan | 2018-06-18 | 1 | -1/+2 |
* | | | | | | | Honor saml assurance level to allow 2FA bypassing | Roger Rüttimann | 2018-06-25 | 4 | -0/+27 |
* | | | | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master' | Douwe Maan | 2018-06-25 | 1 | -10/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Moves another RPC to mandatory | Zeger-Jan van de Weg | 2018-06-25 | 1 | -10/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'zj-is-anchestor' into 'master' | Douwe Maan | 2018-06-25 | 2 | -91/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update remote happens through Gitaly only | Zeger-Jan van de Weg | 2018-06-25 | 1 | -75/+2 |
| * | | | | | | | Anchestor check is Gitaly only now | Zeger-Jan van de Weg | 2018-06-25 | 1 | -16/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'zj-write-config' into 'master' | Douwe Maan | 2018-06-25 | 1 | -9/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Write Config is mandatory | Zeger-Jan van de Weg | 2018-06-25 | 1 | -9/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'zj-missing-part-linguist' into 'master' | Douwe Maan | 2018-06-25 | 1 | -23/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove feature gatezj-missing-part-linguist | Zeger-Jan van de Weg | 2018-06-25 | 1 | -23/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'zj-tree-entry-mandatory' into 'master' | Douwe Maan | 2018-06-25 | 1 | -87/+26 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Gitaly tree entry is mandatoryzj-tree-entry-mandatory | Zeger-Jan van de Weg | 2018-06-25 | 1 | -87/+26 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'enforce-variable-value-to-be-a-string' into 'master' | Grzegorz Bizon | 2018-06-25 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Enforce setting string as value of the CI/CD variable | Tomasz Maczukin | 2018-06-25 | 1 | -0/+3 |
* | | | | | | | Merge branch 'jprovazn-rails5-mysql-datetime' into 'master' | Yorick Peterse | 2018-06-25 | 1 | -0/+18 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Mysql fixes for Rails 5jprovazn-rails5-mysql-datetime | Jan Provaznik | 2018-06-21 | 1 | -0/+18 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'zj-commit-raw-diffs' into 'master' | Douwe Maan | 2018-06-22 | 1 | -7/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Raw diffs are served from Gitalyzj-commit-raw-diffs | Zeger-Jan van de Weg | 2018-06-22 | 1 | -7/+3 |
* | | | | | | | Merge branch 'rs-lib-gitlab-git-gitlab_projects-parity' into 'master' | Robert Speicher | 2018-06-22 | 1 | -12/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | CE-EE parity for lib/gitlab/git/gitlab_projects.rbrs-lib-gitlab-git-gitlab_projects-parity | Robert Speicher | 2018-06-20 | 1 | -12/+13 |
* | | | | | | | | Merge branch 'zj-find-ref-name' into 'master' | Douwe Maan | 2018-06-22 | 1 | -11/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | FindRefName RPC now mandatoryzj-find-ref-name | Zeger-Jan van de Weg | 2018-06-22 | 1 | -11/+1 |
* | | | | | | | | | Merge branch 'bjk/48176_ruby_gc' into 'master' | Yorick Peterse | 2018-06-22 | 1 | -12/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Cleanup ruby sampler metricsbjk/48176_ruby_gc | Ben Kochie | 2018-06-22 | 1 | -12/+14 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'zj-repository-size' into 'master' | Douwe Maan | 2018-06-22 | 1 | -15/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Repository size is Gitaly onlyzj-repository-size | Zeger-Jan van de Weg | 2018-06-22 | 1 | -15/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'docs-request-cache' into 'master' | Sean McGivern | 2018-06-22 | 1 | -36/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add docs for RequestCache, moved from comments | Lin Jen-Shin | 2018-06-22 | 1 | -36/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Git ls files is Gitaly only now | Zeger-Jan van de Weg | 2018-06-22 | 1 | -34/+1 |
| |/ / / / / / |/| | | | | | |