Commits · 7943cea9b2b614865258568a0fac7c6e66273754 · nexedi / gitlab-ce

29 Aug, 2019 40 commits
- 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 · 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
- Merge branch 'security-add-job-activity-limit' into 'master' · a7fcc979
  GitLab Release Tools Bot authored Aug 29, 2019
```
Introduce JobActivity limit for alive jobs

Closes #376

See merge request gitlab/gitlab-ee!1182
```
  a7fcc979
- Merge branch 'security-ssrf-kubernetes-dns-12-3' into 'master' · 5c75e60c
  GitLab Release Tools Bot authored Aug 29, 2019
```
DNS Rebind SSRF in Kubernetes Integration

See merge request gitlab/gitlab-ee!1188
```
  5c75e60c
- Merge branch 'security-sarcila-fix-weak-session-management' into 'master' · e7e7d9c5
  GitLab Release Tools Bot authored Aug 29, 2019
```
Clear reset_password_tokens when login (email or username) change

See merge request gitlab/gitlab-ee!1193
```
  e7e7d9c5
- Merge branch 'ee-security-hide_merge_request_ids_on_emails' into 'master' · 5ff36b4c
  GitLab Release Tools Bot authored Aug 29, 2019
```
Prevent disclosure of merge request id via email

See merge request gitlab/gitlab-ee!1198
```
  5ff36b4c
- Fixed spelling · 225fba83
  Shan authored Aug 29, 2019
  
  225fba83
- Merge branch 'security-ci-metrics-permissions' into 'master' · 3d9f8497
  GitLab Release Tools Bot authored Aug 29, 2019
```
Restrict MergeRequests#test_reports to authenticated users with read-access on Builds

See merge request gitlab/gitlab-ee!1203
```
  3d9f8497
- Merge branch 'security-personal-snippets-ee' into 'master' · 5a418d52
  GitLab Release Tools Bot authored Aug 29, 2019
```
Add direct upload support for personal snippets

See merge request gitlab/gitlab-ee!1208
```
  5a418d52
- Merge branch 'security-group-runners-permissions-ee' into 'master' · 884ec2b9
  GitLab Release Tools Bot authored Aug 29, 2019
```
admin_group authorization for Groups::RunnersController

See merge request gitlab/gitlab-ee!1213
```
  884ec2b9
- Merge branch 'security-fix-markdown-ee' into 'master' · a88e466f
  GitLab Release Tools Bot authored Aug 29, 2019
```
Re-escape the whole HTML content when finding HTML references

See merge request gitlab/gitlab-ee!1217
```
  a88e466f
- Merge branch 'security-64711-fix-commit-todos-ee' into 'master' · 4a0437c0
  GitLab Release Tools Bot authored Aug 29, 2019
```
Send TODOs for comments on commits correctly

See merge request gitlab/gitlab-ee!1219
```
  4a0437c0
- Merge branch 'security-gitaly-1.61.0-ee' into 'master' · 6f2b3cda
  GitLab Release Tools Bot authored Aug 29, 2019
```
Gitaly: ignore git redirects

See merge request gitlab/gitlab-ee!1226
```
  6f2b3cda
- Merge branch 'security-exposed-default-branch' into 'master' · a71f43cf
  GitLab Release Tools Bot authored Aug 29, 2019
```
Avoid exposing unaccessible repo data upon GFM post processing

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

Closes #2812

See merge request gitlab/gitlabhq!2926
```
  09095625
- Merge branch 'security-2853-prevent-comments-on-private-mrs' into 'master' · 21b5239a
  GitLab Release Tools Bot authored Aug 29, 2019
```
Ensure only authorised users can create notes on merge requests and issues

See merge request gitlab/gitlabhq!3137
```
  21b5239a
- Merge branch 'security-epic-notes-api-reveals-historical-info-ce-master' into 'master' · 5a008d13
  GitLab Release Tools Bot authored Aug 29, 2019
```
Filter out old system notes for epics in notes api endpoint response

See merge request gitlab/gitlabhq!3224
```
  5a008d13
- Merge branch 'security-personal-snippets' into 'master' · 34c2b6ad
  GitLab Release Tools Bot authored Aug 29, 2019
```
Add direct upload support for personal snippets

See merge request gitlab/gitlabhq!3226
```
  34c2b6ad
- Merge branch 'security-fix-html-injection-for-label-description-ce-master' into 'master' · 170cb8bc
  GitLab Release Tools Bot authored Aug 29, 2019
```
Fix HTML injection for label description

See merge request gitlab/gitlabhq!3250
```
  170cb8bc
- Merge branch 'security-fix_jira_ssrf_vulnerability' into 'master' · 7d6ec7f7
  GitLab Release Tools Bot authored Aug 29, 2019
```
Fix DNS rebind vulnerability for JIRA integration

See merge request gitlab/gitlabhq!3266
```
  7d6ec7f7
- Merge branch 'security-61974-limit-issue-comment-size' into 'master' · b01c7ad2
  GitLab Release Tools Bot authored Aug 29, 2019
```
Limit the size of issuable description and comments

See merge request gitlab/gitlabhq!3267
```
  b01c7ad2
- Merge branch 'security-59549-add-capcha-for-failed-logins' into 'master' · a5b2a378
  GitLab Release Tools Bot authored Aug 29, 2019
```
Require a captcha after unique failed logins from the same IP

See merge request gitlab/gitlabhq!3270
```
  a5b2a378
- Merge branch 'security-mr-head-pipeline-leak' into 'master' · e20fb7cb
  GitLab Release Tools Bot authored Aug 29, 2019
```
Permission fix for MergeRequestsController#pipeline_status

See merge request gitlab/gitlabhq!3274
```
  e20fb7cb