Commits · fd03bf75e82d8b7248bef8911b5be2eedd9d1ab0 · nexedi / gitlab-ce

30 May, 2019 3 commits
- Protect Gitlab::HTTP against DNS rebinding attack · fd03bf75
  Douwe Maan authored Apr 21, 2019
```
Gitlab::HTTP now resolves the hostname only once, verifies the IP is not
blocked, and then uses the same IP to perform the actual request, while
passing the original hostname in the `Host` header and SSL SNI field.
```
  fd03bf75
- Update CHANGELOG.md for 11.9.12 · 6e7d675d
  GitLab Release Tools Bot authored May 30, 2019
```
[ci skip]
```
  6e7d675d
- Update CHANGELOG-EE.md for 11.9.12-ee · 404556f7
  GitLab Release Tools Bot authored May 30, 2019
```
[ci skip]
```
  404556f7
28 May, 2019 37 commits
- Automatic merge of gitlab-org/gitlab-ce master · c4f94a99
  GitLab Bot authored May 28, 2019
  
  c4f94a99
- Merge branch 'revert-daa72ac8' into 'master' · 35dfe85f
  Kushal Pandya authored May 28, 2019
```
Revert "Add expand/collapse button to operation settings"

See merge request gitlab-org/gitlab-ce!28818
```
  35dfe85f
- Revert "Merge branch '61511-add-expand-collapse-to-project-operation-setttings-2' into 'master'" · b9ee324a
  Winnie Hellmann authored May 28, 2019
```
This reverts merge request !28620
```
  b9ee324a
- Automatic merge of gitlab-org/gitlab-ce master · 6ab3388c
  GitLab Bot authored May 28, 2019
  
  6ab3388c
- Merge branch 'ee-monitoring-dashboard-spec' into 'master' · 58f0cc51
  Kushal Pandya authored May 28, 2019
```
Fix failing EE component spec

Closes #11791

See merge request gitlab-org/gitlab-ee!13459
```
  58f0cc51
- Merge branch 'dz-scope-project-routes-2' into 'master' · 74001467
  Dmitriy Zaporozhets authored May 28, 2019
```
Move more project routes under /-/ scope

See merge request gitlab-org/gitlab-ce!28717
```
  74001467
- Automatic merge of gitlab-org/gitlab-ce master · 0618c2ae
  GitLab Bot authored May 28, 2019
  
  0618c2ae
- Merge branch 'winh-upgrade-jest' into 'master' · 018360f1
  Phil Hughes authored May 28, 2019
```
Upgrade Jest to v24.8.0

See merge request gitlab-org/gitlab-ce!28786
```
  018360f1
- Upgrade Jest to v24.8.0 · 2c5cbdb6
  Winnie Hellmann authored May 28, 2019
  
  2c5cbdb6
- Merge branch 'winh-upgrade-jest-ee' into 'master' · 1d20c2c5
  Phil Hughes authored May 28, 2019
```
Upgrade Jest to v24.8.0 (EE-port)

See merge request gitlab-org/gitlab-ee!13436
```
  1d20c2c5
- Upgrade Jest to v24.8.0 (EE-port) · 6530bcb8
  Winnie Hellmann authored May 28, 2019
  
  6530bcb8
- Automatic merge of gitlab-org/gitlab-ce master · 79b4fcc2
  GitLab Bot authored May 28, 2019
  
  79b4fcc2
- Merge branch 'use-source-ref-name-in-webhook' into 'master' · 2714f85c
  Ash McKenzie authored May 28, 2019
```
Use source ref in pipeline webhook

Closes #61553

See merge request gitlab-org/gitlab-ce!28772
```
  2714f85c
- Merge branch 'issue/9978' into 'master' · 85b5d31a
  Filipa Lacerda authored May 28, 2019
```
added code differences from EE to CE

See merge request gitlab-org/gitlab-ce!28711
```
  85b5d31a
- added a new conditional to add `display: none;` dynamically if the row should... · 9e275b14
  Michel Engelen authored May 28, 2019
```
added a new conditional to add `display: none;` dynamically if the row should be hidden, indicated by the variable `rowHidden`

this solves issue #9978
```
  9e275b14
- Automatic merge of gitlab-org/gitlab-ce master · 3092b308
  GitLab Bot authored May 28, 2019
  
  3092b308
- Merge branch 'renovate/gitlab-svgs-1.x' into 'master' · 2cc6e6ff
  Phil Hughes authored May 28, 2019
```
Update dependency @gitlab/svgs to ^1.63.0

See merge request gitlab-org/gitlab-ce!28715
```
  2cc6e6ff
- Merge branch 'fix-format-date-safari-ff' into 'master' · f3cf031a
  Phil Hughes authored May 28, 2019
```
Throw an error when formatDate's input is invalid

See merge request gitlab-org/gitlab-ce!28713
```
  f3cf031a
- Throw an error when formatDate's input is invalid · dade5a44
  Paul Gascou-Vaillancourt authored May 28, 2019
  
  dade5a44
- Merge branch 'licenses-app-disabled-default' into 'master' · f14948f8
  Filipa Lacerda authored May 28, 2019
```
Disable licenses_app feature flag

Closes #11534

See merge request gitlab-org/gitlab-ee!13291
```
  f14948f8
- Merge branch 'project-members-scb' into 'master' · ff7766b9
  Phil Hughes authored May 28, 2019
```
Resolve CE/EE diffs in project members

Closes gitlab-ee#10496

See merge request gitlab-org/gitlab-ce!28550
```
  ff7766b9
- Merge branch 'project-members-scb' into 'master' · 89bad287
  Phil Hughes authored May 28, 2019
```
Resolve CE/EE diffs in project members

Closes #10496

See merge request gitlab-org/gitlab-ee!13101
```
  89bad287
- Automatic merge of gitlab-org/gitlab-ce master · 2e939f10
  GitLab Bot authored May 28, 2019
  
  2e939f10
- Merge branch 'ee-i18n-preferences-of-user-profile' into 'master' · 0b465f00
  Bob Van Landuyt authored May 28, 2019
```
Externalize strings of preferences page in user profile

See merge request gitlab-org/gitlab-ee!13338
```
  0b465f00
- Merge branch 'i18n-preferences-of-user-profile' into 'master' · e2126185
  Bob Van Landuyt authored May 28, 2019
```
Externalize strings of preferences page in user profile

See merge request gitlab-org/gitlab-ce!28746
```
  e2126185
- Automatic merge of gitlab-org/gitlab-ce master · 58c4a03a
  GitLab Bot authored May 28, 2019
  
  58c4a03a
- Merge branch 'id-bug-suggested-changes-remove-empty-line' into 'master' · cc4d5f0a
  Stan Hu authored May 28, 2019
```
Append endline only if suggestion present

Closes #58566

See merge request gitlab-org/gitlab-ce!28703
```
  cc4d5f0a
- Fix removing empty lines via suggestions · c92db3db
  Igor authored May 28, 2019
```
Before this fix, a suggestion which just removes
an empty line wasn't appliable
```
  c92db3db
- Merge branch 'ee-i18n-authentication_log-of-user-profile' into 'master' · ff2d51a7
  Bob Van Landuyt authored May 28, 2019
```
Externalize stirngs of Authentication log page in user profile

See merge request gitlab-org/gitlab-ee!13340
```
  ff2d51a7
- Merge branch 'i18n-authentication_log-of-user-profile' into 'master' · 6da066c1
  Bob Van Landuyt authored May 28, 2019
```
Externalize stirngs of Authentication log page in user profile

See merge request gitlab-org/gitlab-ce!28750
```
  6da066c1
- Externalize stirngs of Authentication log page in user profile · cdb9ce4d
  antony liu authored May 28, 2019
  
  cdb9ce4d
- Automatic merge of gitlab-org/gitlab-ce master · e395cd53
  GitLab Bot authored May 28, 2019
  
  e395cd53
- Merge branch 'api_make_protected_boolean_type' into 'master' · c7fc58bc
  Jan Provaznik authored May 28, 2019
```
protected should be Boolean type

See merge request gitlab-org/gitlab-ce!28766
```
  c7fc58bc
- Merge branch 'dz-scope-project-routes-2-ee' into 'master' · 8d50b3ae
  Bob Van Landuyt authored May 28, 2019
```
Move more project routes under /-/ scope [EE]

See merge request gitlab-org/gitlab-ee!13408
```
  8d50b3ae
- Merge branch '61511-add-expand-collapse-to-project-operation-setttings-2' into 'master' · daa72ac8
  Kushal Pandya authored May 28, 2019
```
Add expand/collapse button to operation settings

Closes #61511

See merge request gitlab-org/gitlab-ce!28620
```
  daa72ac8
- Add expand/collapse button · e0c5deaf
  Adriel Santiago authored May 28, 2019
```
Add ability to expand/collapse operation settings
```
  e0c5deaf
- Automatic merge of gitlab-org/gitlab-ce master · 4bcd7bad
  GitLab Bot authored May 28, 2019
  
  4bcd7bad