Commits · 01217d3dd0ca7c837f34e479c751628190ec3d74 · nexedi / gitlab-ce

30 Aug, 2019 15 commits
- Automatic merge of gitlab-org/gitlab-ce master · 01217d3d
  GitLab Bot authored Aug 30, 2019
  
  01217d3d
- Merge branch 'patch-79' into 'master' · bfdb41be
  Ray Paik authored Aug 30, 2019
```
Fixed spelling

See merge request gitlab-org/gitlab-ce!32434
```
  bfdb41be
- Merge branch 'revert-79fa2cd9' into 'master' · 98f2ab29
  Evan Read authored Aug 30, 2019
```
Revert "Merge branch 'nik-api-snippets-fix' into 'master'"

Closes #66673

See merge request gitlab-org/gitlab-ce!32295
```
  98f2ab29
- Merge branch 'resolve-srv-records-for-db-lb' into 'master' · 8a444ad8
  Thong Kuah authored Aug 30, 2019
```
Resolve SRV records for DB load balancing

Closes #13858

See merge request gitlab-org/gitlab-ee!15691
```
  8a444ad8
- Automatic merge of gitlab-org/gitlab-ce master · ea74db43
  GitLab Bot authored Aug 30, 2019
  
  ea74db43
- Merge branch 'docs-markdownlint-fixes-2' into 'master' · 329839be
  Evan Read authored Aug 30, 2019
```
Fix markdown in various docs (part 2)

See merge request gitlab-org/gitlab-ce!32269
```
  329839be
- Fix markdown in various docs · 513d3f58
  Marcel Amirault authored Aug 30, 2019
```
Clean up issues that may cause the docs-lint
test to fail, such as trailing whitespace, no
EOF newline, blockquotes, etc
```
  513d3f58
- Automatic merge of gitlab-org/gitlab-ce master · 4d60fa51
  GitLab Bot authored Aug 30, 2019
  
  4d60fa51
- Merge branch 'lint/fix-failing-markdown-file' into 'master' · e348def8
  Evan Read authored Aug 30, 2019
```
Add second space to lines failing lint

See merge request gitlab-org/gitlab-ce!32435
```
  e348def8
- Remove spaces from lines failing lint · e92b8219
  Thomas Randolph authored Aug 29, 2019
  
  e92b8219
- Automatic merge of gitlab-org/gitlab-ce master · 52c314aa
  GitLab Bot authored Aug 30, 2019
  
  52c314aa
- Merge branch 'fix-test-design-link' into 'master' · 13627ca9
  Evan Read authored Aug 30, 2019
```
Broken Link to Test Design

See merge request gitlab-org/gitlab-ce!32279
```
  13627ca9
- Merge branch 'docs-ado-extra-build-args' into 'master' · 25341f58
  Evan Read authored Aug 30, 2019
```
Document the AUTO_DEVOPS_BUILD_IMAGE_EXTRA_ARGS project variable

See merge request gitlab-org/gitlab-ce!32057
```
  25341f58
- Document the AUTO_DEVOPS_BUILD_IMAGE_EXTRA_ARGS project variable · 6f47a6d1
  Hordur Freyr Yngvason authored Aug 30, 2019
  
  6f47a6d1
- Automatic merge of gitlab-org/gitlab-ce master · 05a5a55e
  GitLab Bot authored Aug 30, 2019
  
  05a5a55e
29 Aug, 2019 25 commits
- Merge branch 'quarantine-saml-sso-spec' into 'master' · 29e92441
  Mark Lapierre authored Aug 29, 2019
```
Quarantine flaky Group SAML SSO spec

See merge request gitlab-org/gitlab-ee!15844
```
  29e92441
- Quarantine flaky Group SAML SSO spec · 19b2e8e7
  Jennifer Louie authored Aug 29, 2019
  
  19b2e8e7
- Merge branch 'ce-backport-of-ml-web-terminal-spec-qa' into 'master' · 739ecdb6
  Dan Davison authored Aug 29, 2019
```
Backport changes from EE MR 8186

See merge request gitlab-org/gitlab-ce!31707
```
  739ecdb6
- Merge branch 'ml-web-terminal-spec-qa' into 'master' · b24d7793
  Dan Davison authored Aug 29, 2019
```
Add e2e test for web terminal

Closes gitlab-org/quality/testcases#85

See merge request gitlab-org/gitlab-ee!8186
```
  b24d7793
- Add e2e test for web terminal · 6cf43e67
  Mark Lapierre authored Aug 29, 2019
```
Adds an end-to-end test of starting a web terminal in the Web IDE
Allow runner config to be set
Use API to commit and configure runner
Let runner run untagged and expose container port
```
  6cf43e67
- Automatic merge of gitlab-org/gitlab-ce master · 7943cea9
  GitLab Bot authored Aug 29, 2019
  
  7943cea9
- Merge branch 'patch-78' into 'master' · ee18bf57
  Ray Paik authored Aug 29, 2019
```
Fixed spelling

See merge request gitlab-org/gitlab-ce!32432
```
  ee18bf57
- Merge branch 'patch-77' into 'master' · 0aee1420
  Ray Paik authored Aug 29, 2019
```
Fixed spelling

See merge request gitlab-org/gitlab-ce!32431
```
  0aee1420
- Automatic merge of gitlab-org/gitlab-ce master · bb56b88e
  GitLab Bot authored Aug 29, 2019
  
  bb56b88e
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee · 9d9960bd
  Robert Speicher authored Aug 29, 2019
  
  9d9960bd
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 7698d405
  Robert Speicher authored Aug 29, 2019
  
  7698d405
- Automatic merge of gitlab-org/gitlab-ce master · 8f20404c
  GitLab Bot authored Aug 29, 2019
  
  8f20404c
- Merge branch 'sh-add-delete-confirmation' into 'master' · fa160c26
  Michael Kozono authored Aug 29, 2019
```
Make it harder to delete issuables accidentally

Closes #62387

See merge request gitlab-org/gitlab-ce!32376
```
  fa160c26
- Merge branch 'sh-add-delete-confirmation-ee' into 'master' · 09bb7170
  Michael Kozono authored Aug 29, 2019
```
Make it harder to delete issuables accidentally

Closes gitlab-ce#62387

See merge request gitlab-org/gitlab-ee!15794
```
  09bb7170
- Fixed spelling · be685251
  Shan authored Aug 29, 2019
  
  be685251
- Fixed spelling · 93414068
  Shan authored Aug 29, 2019
  
  93414068
- Merge branch 'security-epic-notes-api-reveals-historical-info-ee-master' into 'master' · e6d838eb
  GitLab Release Tools Bot authored Aug 29, 2019
```
Filter out old system notes for epics in notes api endpoint response

See merge request gitlab/gitlab-ee!1057
```
  e6d838eb
- Merge branch 'security-enable-image-proxy-ee' into 'master' · 6f591260
  GitLab Release Tools Bot authored Aug 29, 2019
```
Use image proxy to mitigate stealing ip addresses

See merge request gitlab/gitlab-ee!1068
```
  6f591260
- Merge branch 'security-fix-html-injection-for-label-description-ee-master' into 'master' · 9b6a1715
  GitLab Release Tools Bot authored Aug 29, 2019
```
Fix HTML injection for label description

See merge request gitlab/gitlab-ee!1100
```
  9b6a1715
- Merge branch 'security-61974-limit-issue-comment-size-ee' into 'master' · 9407788a
  GitLab Release Tools Bot authored Aug 29, 2019
```
Limit the size of issuable description and comments

See merge request gitlab/gitlab-ee!1119
```
  9407788a
- Merge branch 'security-mr-head-pipeline-leak' into 'master' · 2cabdd68
  GitLab Release Tools Bot authored Aug 29, 2019
```
Permission fix for MergeRequestsController#pipeline_status

See merge request gitlab/gitlab-ee!1128
```
  2cabdd68
- Merge branch 'security-katex-dos-master-ee' into 'master' · 73cde5a0
  GitLab Release Tools Bot authored Aug 29, 2019
```
Enforce max chars and max render time in markdown math

See merge request gitlab/gitlab-ee!1138
```
  73cde5a0
- Merge branch 'security-59549-add-capcha-for-failed-logins-ee' into 'master' · 20df592d
  GitLab Release Tools Bot authored Aug 29, 2019
```
Require a captcha after unique failed logins from the same IP

See merge request gitlab/gitlab-ee!1148
```
  20df592d
- Merge branch 'security-fix_jira_ssrf_vulnerability' into 'master' · 0a82ef46
  GitLab Release Tools Bot authored Aug 29, 2019
```
Fix DNS rebind vulnerability for JIRA integration

See merge request gitlab/gitlab-ee!1163
```
  0a82ef46
- Merge branch 'security-project-import-bypass' into 'master' · 4edefa7b
  GitLab Release Tools Bot authored Aug 29, 2019
```
Project visibility restriction bypass

See merge request gitlab/gitlab-ee!1174
```
  4edefa7b