summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-find-all-commits' into 'master'Douwe Maan2018-06-281-49/+2
|\
| * FindAllCommits mandatoryZeger-Jan van de Weg2018-06-281-49/+2
* | Merge branch 'zj-commits-between-mandatory' into 'master'Douwe Maan2018-06-282-29/+2
|\ \
| * | Commits between in Gitaly onlyZeger-Jan van de Weg2018-06-282-29/+2
* | | Merge branch 'bvl-graphql-permissions' into 'master'Sean McGivern2018-06-282-1/+25
|\ \ \ | |_|/ |/| |
| * | Expose permissions on types in GraphQLBob Van Landuyt2018-06-282-1/+25
* | | Merge branch 'straight-comparision-mode' into 'master'Sean McGivern2018-06-281-1/+2
|\ \ \
| * | | Allow straight diff in Compare APIMaciej Nowak2018-06-281-1/+2
* | | | Merge branch 'db-configure-after-drop-tables' into 'master'Douwe Maan2018-06-281-1/+3
|\ \ \ \
| * | | | Fixes an issue where migrations instead of schema loading were runDJ Mountney2018-06-271-1/+3
* | | | | Merge branch 'gitaly-mandatory-20180627-jv-2' into 'master'Douwe Maan2018-06-282-47/+6
|\ \ \ \ \
| * | | | | Make Gitaly signature RPC's mandatoryJacob Vosmaer2018-06-272-47/+6
* | | | | | Merge branch 'gitaly-mandatory-20180627-jv' into 'master'Douwe Maan2018-06-283-38/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Make search and message RPC's mandatoryJacob Vosmaer2018-06-273-38/+4
| |/ / / /
* | | | | Add SHA256 and HEAD on File APIAhmet Demir2018-06-282-11/+56
* | | | | Merge branch 'rs-authorize-is-hard-to-spell' into 'master'Stan Hu2018-06-271-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Correct "autorize" typosRobert Speicher2018-06-271-1/+1
* | | | | Bring Gitlab::ShardHealthCache to CEToon Claes2018-06-271-0/+41
|/ / / /
* | | | 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
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |