Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'zj-find-all-commits' into 'master' | Douwe Maan | 2018-06-28 | 1 | -49/+2 |
|\ | |||||
| * | FindAllCommits mandatory | Zeger-Jan van de Weg | 2018-06-28 | 1 | -49/+2 |
* | | Merge branch 'zj-commits-between-mandatory' into 'master' | Douwe Maan | 2018-06-28 | 2 | -29/+2 |
|\ \ | |||||
| * | | Commits between in Gitaly only | Zeger-Jan van de Weg | 2018-06-28 | 2 | -29/+2 |
* | | | Merge branch 'bvl-graphql-permissions' into 'master' | Sean McGivern | 2018-06-28 | 2 | -1/+25 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Expose permissions on types in GraphQL | Bob Van Landuyt | 2018-06-28 | 2 | -1/+25 |
* | | | Merge branch 'straight-comparision-mode' into 'master' | Sean McGivern | 2018-06-28 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | Allow straight diff in Compare API | Maciej Nowak | 2018-06-28 | 1 | -1/+2 |
* | | | | Merge branch 'db-configure-after-drop-tables' into 'master' | Douwe Maan | 2018-06-28 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Fixes an issue where migrations instead of schema loading were run | DJ Mountney | 2018-06-27 | 1 | -1/+3 |
* | | | | | Merge branch 'gitaly-mandatory-20180627-jv-2' into 'master' | Douwe Maan | 2018-06-28 | 2 | -47/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Make Gitaly signature RPC's mandatory | Jacob Vosmaer | 2018-06-27 | 2 | -47/+6 |
* | | | | | | Merge branch 'gitaly-mandatory-20180627-jv' into 'master' | Douwe Maan | 2018-06-28 | 3 | -38/+4 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Make search and message RPC's mandatory | Jacob Vosmaer | 2018-06-27 | 3 | -38/+4 |
| |/ / / / | |||||
* | | | | | Add SHA256 and HEAD on File API | Ahmet Demir | 2018-06-28 | 2 | -11/+56 |
* | | | | | Merge branch 'rs-authorize-is-hard-to-spell' into 'master' | Stan Hu | 2018-06-27 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Correct "autorize" typos | Robert Speicher | 2018-06-27 | 1 | -1/+1 |
* | | | | | Bring Gitlab::ShardHealthCache to CE | Toon Claes | 2018-06-27 | 1 | -0/+41 |
|/ / / / | |||||
* | | | | 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 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | |