summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Add User#will_save_change_to_login? to clear reset_password_tokensSebastian Arcila Valenzuela2019-08-214-0/+71
| |/ / / / /
* | | | | | Merge branch 'security-ci-metrics-permissions-12-1' into '12-1-stable'GitLab Release Tools Bot2019-08-263-8/+64
|\ \ \ \ \ \
| * | | | | | Restrict MergeRequests#test_reports to authenticated users with read-access o...drew cimino2019-08-223-8/+64
| |/ / / / /
* | | | | | Merge branch 'security-personal-snippets-12-1' into '12-1-stable'GitLab Release Tools Bot2019-08-2612-10/+77
|\ \ \ \ \ \
| * | | | | | Add direct upload support for personal snippetsJan Provaznik2019-08-2312-10/+77
| |/ / / / /
* | | | | | Merge branch 'security-group-runners-permissions-12-1' into '12-1-stable'GitLab Release Tools Bot2019-08-263-43/+173
|\ \ \ \ \ \
| * | | | | | admin_group authorization for Groups::RunnersControllerdrew cimino2019-08-223-43/+173
| |/ / / / /
* | | | | | Merge branch 'security-fix-markdown-xss-12-1' into '12-1-stable'GitLab Release Tools Bot2019-08-268-13/+76
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Re-escape whole HTML content instead of only matchJan Provaznik2019-08-238-13/+76
|/ / / / /
* | | | | Merge branch 'jts/update-changelog' into '12-1-stable'Marin Jankovski2019-08-161-4/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Updates changlog to reflect appropriate version releaseJohn T Skarbek2019-08-121-4/+3
|/ / / /
* | | | Update VERSION to 12.1.6v12.1.6GitLab Release Tools Bot2019-08-121-1/+1
* | | | Update CHANGELOG.md for 12.1.6GitLab Release Tools Bot2019-08-121-0/+4
|/ / /
* | | 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
|/