summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 12.1.5v12.1.5GitLab Release Tools Bot2019-08-091-1/+1
* Update CHANGELOG.md for 12.1.5GitLab Release Tools Bot2019-08-093-10/+8
* Merge branch 'pokstad1-12-1-stable-patch-25365' into '12-1-stable'John Skarbek2019-08-092-1/+6
|\
| * Update Gitaly to v1.53.2 for security fixPaul Okstad2019-08-092-1/+6
|/
* Merge branch 'security-12-1-fix-gitlab-api-token-recovery' into '12-1-stable'John Skarbek2019-08-092-1/+6
|\
| * Upgrade pages version to 1.7.1Vladimir Shushlin2019-07-312-1/+6
* | Update VERSION to 12.1.4v12.1.4GitLab Release Tools Bot2019-08-051-1/+1
* | Update CHANGELOG.md for 12.1.4GitLab Release Tools Bot2019-08-055-20/+13
* | Merge branch '12-1-stable-patch-4' into '12-1-stable'Robert Speicher2019-08-0525-102/+259
|\ \ | |/ |/|
| * Merge branch '12-1-stable-patch-4-updated' into '12-1-stable-patch-4'John Skarbek2019-08-052-1/+6
| |\
| | * Fix translation of 'Updated' term in projects listPaul Gascou-Vaillancourt2019-08-052-1/+6
| |/
| * Merge branch 'leipert-no-danger-on-stbl' into 'master'Robert Speicher2019-08-051-0/+1
| * Merge branch 'leipert-remove-docker-host' into 'master'Bob Van Landuyt2019-08-052-2/+2
| * Merge branch 'sh-fix-mermaid-subgraphs-docs' into 'master'Evan Read2019-08-054-28/+19
| * Merge branch 'sh-mermaid-subgraph-docs' into 'master'Evan Read2019-08-051-0/+43
| * Merge branch 'leipert-improve-ansi2html' into 'master'Fatih Acet2019-08-057-44/+54
| * Merge branch 'patch-72' into 'master'Thong Kuah2019-08-052-0/+6
| * Merge branch 'osw-avoid-errors-due-to-concurrent-calls' into 'master'12-1-stable-patch-4Douwe Maan2019-08-057-27/+128
|/
* Update VERSION to 12.1.3v12.1.3fix_docs_lint-12-1GitLab Release Tools Bot2019-07-301-1/+1
* Update CHANGELOG.md for 12.1.3GitLab Release Tools Bot2019-07-3013-61/+21
* Merge branch '12-1-stable-patch-3' into '12-1-stable'Robert Speicher2019-07-3056-148/+534
|\
| * Merge branch 'docs-fix-broken-internal-links' into 'master'Marcia Ramos2019-07-302-2/+2
| * Merge branch 'sh-fix-gitaly-access-control' into 'master'Douglas Barbosa Alexandre2019-07-303-1/+16
| * Merge branch 'sh-fix-pdfjs-page-ordering' into 'master'12-1-stable-patch-3Mike Greiling2019-07-303-9/+16
| * Merge branch 'dm-submodule-links-nil' into 'master'Nick Thomas2019-07-305-3/+75
| * Merge branch 'sh-support-docker-oci-images' into 'master'Dmitriy Zaporozhets2019-07-305-5/+49
| * Merge branch '65019-job-templates-dind-tls-fix' into 'master'Thong Kuah2019-07-306-0/+12
| * Merge branch '65019-auto-devops-dind-tls-fix' into 'master'Thong Kuah2019-07-302-0/+7
| * Merge branch 'alhashash1-12-1-stable-patch-67177' into 'master'Stan Hu2019-07-301-4/+11
| * Merge branch 'optimise-import-performance' into 'master'Stan Hu2019-07-3010-34/+32
| * Merge branch '64091-fix-sprockets-paths' into 'master'Stan Hu2019-07-302-1/+9
| * Merge branch 'dm-submodule-helper-routing' into 'master'Nick Thomas2019-07-303-40/+58
| * Merge branch '64870-can-t-save-pages-domain-form-with-let-s-encrypt-enabled-i...Nick Thomas2019-07-304-1/+115
| * Merge branch '64731-fix-project-auto-devops-api' into 'master'Mayra Cabrera2019-07-305-21/+45
| * Merge branch 'docs-jivanvl-additional-panel-type-support' into 'master'Evan Read2019-07-303-1/+60
| * Merge branch 'registry-fix-multi-delete-modal' into 'master'Kushal Pandya2019-07-301-0/+5
| * Merge branch '11639-improve-discovery-and-navigation-for-gitlab-package-featu...Kushal Pandya2019-07-304-26/+22
|/
* Update CHANGELOG.md for 12.1.2v12.1.2GitLab Release Tools Bot2019-07-262-5/+4
* Merge branch 'security-mr-pipeline-permissions-12-1' into '12-1-stable'GitLab Release Tools Bot2019-07-264-6/+102
|\
| * Use MergeRequest#source_project as permissions reference for MergeRequest#all...drew cimino2019-07-264-6/+102
|/
* Update VERSION to 12.1.2GitLab Release Tools Bot2019-07-251-1/+1
* Update CHANGELOG.md for 12.1.2GitLab Release Tools Bot2019-07-2510-45/+15
* Merge branch 'security-dns-ssrf-bypass-12-1' into '12-1-stable'GitLab Release Tools Bot2019-07-244-14/+49
|\
| * Fix Server Side Request Forgery mitigation bypassFrancisco Javier López2019-07-154-14/+49
* | Merge branch 'security-60143-patch-additional-xss-issue-12.1' into '12-1-stable'GitLab Release Tools Bot2019-07-2410-92/+235
|\ \
| * | Extract SanitizeNodeLink and apply to WikiLinkFilterKerri Miller2019-07-1610-92/+235
| |/
* | Merge branch 'security-github-ssrf-redirect-12-1' into '12-1-stable'GitLab Release Tools Bot2019-07-246-3/+100
|\ \
| * | Do not allow localhost url redirection in GitHub Integrationmanojmj2019-07-096-3/+100
* | | Merge branch 'security-remove-take-trigger-ownership-feature-12-1' into '12-1...GitLab Release Tools Bot2019-07-2411-141/+9
|\ \ \
| * | | Drop feature to take ownership of a trigger tokenFabio Pitino2019-07-1011-141/+9
| |/ /