summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jarv/dev-to-gitl...jarv/dev-to-gitlab-2019-04-02John Jarvis2019-04-0263-32302/+52008
|\
| * Merge branch 'security-exif-migration' into 'master'GitLab Release Tools Bot2019-04-027-1/+363
| |\
| | * Rake task for removing exif from uploadsJan Provaznik2019-04-027-1/+363
| |/
| * Merge branch 'security-2819-xss-resolve-conflicts-branch-name' into 'master'GitLab Release Tools Bot2019-04-023-1/+21
| |\
| | * Fix XSS in resolve conflicts formPaul Slaughter2019-03-073-1/+21
| * | Merge branch 'security-56224' into 'master'GitLab Release Tools Bot2019-04-025-4/+47
| |\ \
| | * | Hide related branches when user does not have permissionMark Chao2019-03-215-4/+47
| * | | Merge branch 'security-id-potential-denial-languages' into 'master'GitLab Release Tools Bot2019-04-0213-18/+130
| |\ \ \
| | * | | Return cached languages if they've been detected beforeIgor Drozdov2019-03-2013-18/+130
| * | | | Merge branch 'security-55503-fix-pdf-js-vulnerability' into 'master'GitLab Release Tools Bot2019-04-028-32169/+50870
| |\ \ \ \
| | * | | | Added changelog entryNatalia Tepluhina2019-03-191-0/+5
| | * | | | Fixed pdf testsNatalia Tepluhina2019-03-132-3/+3
| | * | | | fix: changed PDFJS prop to GlobalWorkerOptionsNatalia Tepluhina2019-03-131-1/+1
| | * | | | Updated PDF.js to 2.0.943Natalia Tepluhina2019-03-124-32165/+50861
| * | | | | Merge branch 'security-use-untrusted-regexp' into 'master'GitLab Release Tools Bot2019-04-0215-96/+198
| |\ \ \ \ \
| | * | | | | Make CI refs matching to to use UntrustedRegexpKamil Trzciński2019-03-1515-96/+198
| * | | | | | Merge branch 'security-milestone-labels' into 'master'GitLab Release Tools Bot2019-04-024-8/+162
| |\ \ \ \ \ \
| | * | | | | | Check if labels are available for target issuableJarka Košanová2019-03-284-8/+162
| * | | | | | | Merge branch 'security-mass-assignment-on-project-update' into 'master'GitLab Release Tools Bot2019-04-023-5/+30
| |\ \ \ \ \ \ \
| | * | | | | | | Refactor specs according to the code reviewMałgorzata Ksionek2019-03-261-1/+1
| | * | | | | | | Add cr remarksMałgorzata Ksionek2019-03-253-5/+5
| | * | | | | | | Disallow changing namespace of a project in update methodMałgorzata Ksionek2019-03-203-5/+30
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'security-disallow-guests-to-access-releases' into 'master'GitLab Release Tools Bot2019-04-024-3/+46
| |\ \ \ \ \ \ \
| | * | | | | | | Disallow guest users from accessing ReleasesShinya Maeda2019-03-264-3/+46
| * | | | | | | | Update CHANGELOG.md for 11.7.10GitLab Release Tools Bot2019-03-281-0/+13
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Update CHANGELOG.md for 11.9.3GitLab Release Tools Bot2019-03-271-0/+14
| * | | | | | | Update CHANGELOG.md for 11.7.8GitLab Release Tools Bot2019-03-261-0/+13
| * | | | | | | Update CHANGELOG.md for 11.9.2GitLab Release Tools Bot2019-03-261-0/+14
| |/ / / / / /
* | | | | | | Merge branch 'kube_helm_auto_devops_213' into 'master'Kamil Trzciński2019-04-022-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Bump Kubectl and Helm in Auto-DevOps.gitlab-ci.ymlkube_helm_auto_devops_213Thong Kuah2019-04-012-2/+7
* | | | | | | | Merge branch 'coverage-parsing-examples' into 'master'Grzegorz Bizon2019-04-021-3/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Add Elixir example for built in coverage tooloptikfluffel2019-03-281-0/+3
| * | | | | | | | Move NodeJS examples next to each otheroptikfluffel2019-03-281-3/+3
* | | | | | | | | Merge branch '56557-add-managed-field-to-cluster' into 'master'Kamil Trzciński2019-04-023-1/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add new field to Clusters tableMayra Cabrera2019-04-023-1/+24
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-transfer-group-possibilities' into 'master'James Lopez2019-04-024-2/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix group transfer selection possibilitiesPeter Marko2019-04-024-2/+49
|/ / / / / / / / /
* | | | | | | | | Merge branch '58879-document-local-tiller-docs' into 'master'Evan Read2019-04-021-14/+36
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Document that local tiller is used for Auto DevOpsThong Kuah2019-04-021-14/+36
|/ / / / / / / / /
* | | | | | | | | Merge branch 'weimeng-master-patch-83366' into 'master'Stan Hu2019-04-021-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix attempting to drop views in PostgreSQLweimeng-master-patch-83366Wei-Meng Lee2019-04-021-1/+4
* | | | | | | | | | Merge branch 'docs-anchors-17' into 'master'Evan Read2019-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Docs: Fix anchor to deprecated variables docMarcel Amirault2019-04-021-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/restructure-ci-envs-and-deployment' into 'master'Mike Lewis2019-04-013-322/+450
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes from reviewdocs/restructure-ci-envs-and-deploymentEvan Read2019-03-271-3/+1
| * | | | | | | | | Refactor and restructure environments pageEvan Read2019-03-263-322/+452
* | | | | | | | | | Merge branch 'docs/refactor-pipeline-schedules' into 'master'Mike Lewis2019-04-011-55/+66
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor and fix pipeline schedulesEvan Read2019-04-011-55/+66
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'bvl-stream-io-into-gitaly' into 'master'Nick Thomas2019-04-016-11/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow streaming io objects into GitalyBob Van Landuyt2019-04-016-11/+22
View Lorry Controller Status