summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '12-1-auto-deploy-20190721' into rs-merge-auto-deploy-securityrs-merge-auto-deploy-securityRobert Speicher2019-07-307-0/+35
|\
| * Merge branch 'security-60143-patch-additional-xss-vector-in-wikis' into 'master'GitLab Release Tools Bot2019-07-269-92/+233
| * Merge branch 'security-fix-badges-leaked-to-unauthorized-users' into 'master'GitLab Release Tools Bot2019-07-263-31/+101
| * Merge branch 'security-remove-take-trigger-ownership-feature' into 'master'GitLab Release Tools Bot2019-07-2611-141/+9
| * Merge branch 'security-mr-pipeline-permissions' into 'master'GitLab Release Tools Bot2019-07-264-6/+102
| * Merge branch 'security-dns-ssrf-bypass' into 'master'GitLab Release Tools Bot2019-07-264-14/+49
| * Merge branch 'security-60551-fix-upload-scope' into 'master'GitLab Release Tools Bot2019-07-267-2/+48
| * Merge branch 'security-hide_moved_issue_id' into 'master'GitLab Release Tools Bot2019-07-263-1/+44
| * Merge branch 'security-bvl-filter-mr-params' into 'master'GitLab Release Tools Bot2019-07-264-8/+83
| * Merge branch 'dm-submodule-links-nil' into 'master'12-1-auto-deploy-20190721Nick Thomas2019-07-265-3/+75
| * Merge branch 'print-sidekiq-class-name-in-memory-killer' into 'master'Stan Hu2019-07-252-7/+19
| * Merge branch 'fix-i18n-updated-projects' into 'master'Clement Ho2019-07-242-1/+6
| * Merge branch 'bw-enable-default-manual-sorting' into 'master'Sean McGivern2019-07-243-3/+3
| * Merge branch 'bw-add-index-for-relative-position' into 'master'Nick Thomas2019-07-244-1/+27
| * Merge branch '65019-job-templates-dind-tls-fix' into 'master'Thong Kuah2019-07-246-0/+12
| * Merge branch '65019-auto-devops-dind-tls-fix' into 'master'Thong Kuah2019-07-242-0/+7
| * Merge branch 'safe-archiving-for-traces' into 'master'Kamil Trzciński2019-07-2416-20/+214
| * Merge branch 'sh-use-shared-state-cluster-pubsub' into 'master'Kamil Trzciński2019-07-235-4/+10
| * Merge branch 'bvl-mark-remote-mirrors-as-failed-sooner' into 'master'Robert Speicher2019-07-233-5/+19
| * Merge branch '64870-can-t-save-pages-domain-form-with-let-s-encrypt-enabled-i...Nick Thomas2019-07-224-1/+115
| * Merge branch 'dm-submodule-helper-routing' into 'master'Nick Thomas2019-07-223-40/+58
| * Merge branch 'docs-le-for-pages-bug-warning' into 'master'Marcia Ramos2019-07-221-2/+21
| * Merge branch 'tr-embed-metrics-frontend' into 'master'Fatih Acet2019-07-2215-50/+410
| * Merge branch 'sl-qa-staging-65-fix-check-mentions-for-xss-spec' into 'master'Ramya Authappan2019-07-221-2/+12
* | Merge branch 'qa-gke-cluster-10gb' into 'master'Dan Davison2019-07-301-0/+1
|\ \
| * | QA spec for Auto DevOps should 10GB GKE diskqa-gke-cluster-10gbDylan Griffith2019-07-301-0/+1
* | | Merge branch 'sh-fix-gitaly-access-control' into 'master'Douglas Barbosa Alexandre2019-07-303-1/+16
|\ \ \
| * | | Fix exception handling in Gitaly autodetectionStan Hu2019-07-303-1/+16
* | | | Merge branch 'fix-update-templates-rake' into 'master'Jan Provaznik2019-07-304-20/+83
|\ \ \ \ | |/ / / |/| | |
| * | | Fix broken update_project_templates rake taskHordur Freyr Yngvason2019-07-304-20/+83
|/ / /
* | | Merge branch 'fix-secpick' into 'master'Stan Hu2019-07-301-1/+1
|\ \ \
| * | | Fix secpick pushing to stable branchfix-secpickThong Kuah2019-07-301-1/+1
* | | | Merge branch 'docs-fix-broken-internal-links' into 'master'Marcia Ramos2019-07-303-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fix broken internal links in docsdocs-fix-broken-internal-linksSean McGivern2019-07-303-3/+3
* | | | Merge branch 'remove-line-profile-from-performance-bar' into 'master'Lin Jen-Shin2019-07-3015-177/+7
|\ \ \ \
| * | | | Remove line profiler from performance barSean McGivern2019-07-3015-177/+7
| |/ / /
* | | | Merge branch 'qa-use-tiller-2.14.2-for-review-apps' into 'master'Lin Jen-Shin2019-07-301-7/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Use the --atomic flag when deploying Review Appsqa-use-tiller-2.14.2-for-review-appsRémy Coutable2019-07-301-7/+1
* | | | Merge branch 'qa-create-elasticsearch' into 'master'Mark Lapierre2019-07-308-6/+64
|\ \ \ \ | |/ / / |/| | |
| * | | Getting on par with EETomislav Nikic2019-07-308-6/+64
|/ / /
* | | Merge branch 'sh-ignore-git-errors-delete-project' into 'master'Ash McKenzie2019-07-303-3/+32
|\ \ \
| * | | Ignore Gitaly errors if cache flushing fails on project destructionStan Hu2019-07-293-3/+32
* | | | Merge branch 'Jenkins_Integration_Mktg_Docs_Page_Update_20190729' into 'master'Evan Read2019-07-301-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Update jenkins.md - add CTA to about.gitlab pageAgnes Oetama2019-07-301-0/+3
|/ / /
* | | Merge branch 'docs-ci-examples-fix-typo' into 'master'Evan Read2019-07-301-1/+1
|\ \ \
| * | | Doc: ci: examples: fix typo EnvoyRomain Aviolat2019-07-291-1/+1
* | | | Merge branch 'docs-ssot-gitlab-basics-1' into 'master'Evan Read2019-07-3011-310/+396
|\ \ \ \
| * | | | First pass to bring /gitlab-basics to SSoT standardsMarcel Amirault2019-07-3011-310/+396
|/ / / /
* | | | Merge branch 'qa-mattermost-spec-retry' into 'master'Sanad Liaquat2019-07-301-4/+6
|\ \ \ \
| * | | | Add retry on exception to mattermost loginqa-mattermost-spec-retryDesiree Chevalier2019-07-291-4/+6