Commits · e949386cad79ca62b8a86df39a932f22aa16e0a2 · nexedi / gitlab-ce

01 Jun, 2018 40 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-01 · e949386c
  GitLab Bot authored Jun 01, 2018
```
# Conflicts:
#	app/assets/javascripts/api.js
#	doc/administration/auth/ldap.md
#	lib/gitlab/auth.rb

[ci skip]
```
  e949386c
- Merge branch 'gitaly-tripswitch' into 'master' · 709e8b26
  Douwe Maan authored Jun 01, 2018
```
Add "deny disk access" Gitaly feature (tripswitch)

Closes gitaly#1210

See merge request gitlab-org/gitlab-ce!19149
```
  709e8b26
- Add "deny disk access" Gitaly feature (tripswitch) · edb9db37
  Jacob Vosmaer (GitLab) authored Jun 01, 2018
  
  edb9db37
- Merge branch 'ee-46481-preserve-warnings-even-if-passed' into 'master' · b0872f44
  Douwe Maan authored Jun 01, 2018
```
EE: Resolve "A lot of constants redefinition warnings"

See merge request gitlab-org/gitlab-ee!5927
```
  b0872f44
- Merge branch '46481-preserve-warnings-even-if-passed' into 'master' · cc5890f2
  Douwe Maan authored Jun 01, 2018
```
Resolve "A lot of constants redefinition warnings"

Closes #46481

See merge request gitlab-org/gitlab-ce!19286
```
  cc5890f2
- Merge branch 'update-preferences-header' into 'master' · 78fe35cc
  Douwe Maan authored Jun 01, 2018
```
Remove 'GitLab' from user preferences header

See merge request gitlab-org/gitlab-ce!19289
```
  78fe35cc
- Merge branch 'fj-45059-add-validation-to-webhook' into 'master' · aa8d3675
  Douwe Maan authored Jun 01, 2018
```
Add validation to webhook and service URLs to ensure they are not blocked because of SSRF

Closes #45059

See merge request gitlab-org/gitlab-ce!18686
```
  aa8d3675
- Add validation to webhook and service URLs to ensure they are not blocked because of SSRF · 840f80d4
  Francisco Javier López authored Jun 01, 2018
  
  840f80d4
- Merge branch 'ee-fj-45059-add-validation-to-webhook' into 'master' · 2151a5b1
  Douwe Maan authored Jun 01, 2018
```
Add validation to webhook and service URLs to ensure they are not blocked because of SSRF

See merge request gitlab-org/gitlab-ee!5851
```
  2151a5b1
- Add validation to webhook and service URLs to ensure they are not blocked because of SSRF · 04483cfc
  Francisco Javier López authored Jun 01, 2018
  
  04483cfc
- Merge branch 'tc-geo-gently-log-prune' into 'master' · 4dc3b309
  Nick Thomas authored Jun 01, 2018
```
Truncate Geo event log with a delay

Closes #6221

See merge request gitlab-org/gitlab-ee!5897
```
  4dc3b309
- Truncate Geo event log with a delay · 1de6ab55
  Toon Claes authored Jun 01, 2018
  
  1de6ab55
- Merge branch '6005-fix-strike-through' into 'master' · 7bce3f87
  Phil Hughes authored Jun 01, 2018
```
Resolve "Strike through the whole line when vulnerability is dismissed"

Closes #6005

See merge request gitlab-org/gitlab-ee!5929
```
  7bce3f87
- Merge branch '46019-add-missing-migration' into 'master' · e206e328
  Yorick Peterse authored Jun 01, 2018
```
Resolve "ActiveRecord::RecordInvalid: Validation failed: Build timeout needs to be at least 10 minutes"

Closes #46019

See merge request gitlab-org/gitlab-ce!18775
```
  e206e328
- Merge branch 'docs-fix-typo-pages-ce' into 'master' · 36617d94
  Achilleas Pipinellis authored Jun 01, 2018
```
Docs: fix typo

See merge request gitlab-org/gitlab-ce!19306
```
  36617d94
- Merge branch 'docs-fix-typo-pages' into 'master' · 7bf573b8
  Achilleas Pipinellis authored Jun 01, 2018
```
Docs: fix typo

See merge request gitlab-org/gitlab-ee!5931
```
  7bf573b8
- Merge branch 'docs-fix-typo-pages' into 'master' · b0e04e96
  Achilleas Pipinellis authored Jun 01, 2018
```
Docs: fix typo

See merge request gitlab-org/gitlab-ee!5931
```
  b0e04e96
- Merge branch 'docs/ldap' into 'master' · 755cd9b6
  Achilleas Pipinellis authored Jun 01, 2018
```
Refactor LDAP docs

See merge request gitlab-org/gitlab-ce!15814
```
  755cd9b6
- Refactor LDAP docs · 83460922
  Achilleas Pipinellis authored Jun 01, 2018
  
  83460922
- Merge branch 'docs/ldap-ee' into 'master' · 60f94fd3
  Achilleas Pipinellis authored Jun 01, 2018
```
Refactor LDAP docs

See merge request gitlab-org/gitlab-ee!3691
```
  60f94fd3
- Refactor LDAP docs · 96ba68c4
  Achilleas Pipinellis authored Jun 01, 2018
  
  96ba68c4
- fix typo · 0fb15e85
  Marcia Ramos authored Jun 01, 2018
  
  0fb15e85
- Merge branch 'add-moneky-patch-for-using-stream-upload-with-carrierwave' into 'master' · 38912b52
  Kamil Trzciński authored Jun 01, 2018
```
Add a monkey patch of https://github.com/carrierwaveuploader/carrierwave/pull/2314

See merge request gitlab-org/gitlab-ce!19102
```
  38912b52
- Striketrhough the entire line · 4dd3dbc1
  Filipa Lacerda authored Jun 01, 2018
  
  4dd3dbc1
- Merge branch '46840-fix-merge-request-unmergeable-email-plural' into 'master' · 279c943c
  Sean McGivern authored Jun 01, 2018
```
Resolve "Unmergeable merge request notification text interpolation"

Closes #46840

See merge request gitlab-org/gitlab-ce!19160
```
  279c943c
- Merge branch 'ce-to-ee-2018-05-31' into 'master' · 0eee2195
  Filipa Lacerda authored Jun 01, 2018
```
CE upstream - 2018-05-31 21:32 UTC

See merge request gitlab-org/gitlab-ee!5925
```
  0eee2195
- Merge branch 'ide-jobs-list-components' into 'master' · 5b9e4d98
  Filipa Lacerda authored Jun 01, 2018
```
Show CI jobs in IDE

Closes #44604

See merge request gitlab-org/gitlab-ce!19106
```
  5b9e4d98
- Merge branch 'ee-ide-jobs-list-components' into 'master' · 239dbdf5
  Filipa Lacerda authored Jun 01, 2018
```
EE port of ide-jobs-list-components

See merge request gitlab-org/gitlab-ee!5904
```
  239dbdf5
- Merge branch 'upgrade-worker-loader' into 'master' · e1247186
  Filipa Lacerda authored Jun 01, 2018
```
Upgrade worker-loader dependency to remove deprecation warnings

See merge request gitlab-org/gitlab-ce!19231
```
  e1247186
- Merge branch 'docs-update-reporter-role' into 'master' · 8d2b4e02
  Achilleas Pipinellis authored Jun 01, 2018
```
Remove assign merge requests ability from reporter role

Closes #44728

See merge request gitlab-org/gitlab-ce!19303
```
  8d2b4e02
- Merge branch 'docs-update-reporter-role' into 'master' · 8dca5dcc
  Achilleas Pipinellis authored Jun 01, 2018
```
Remove assign merge requests ability from reporter role

Closes gitlab-ce#44728

See merge request gitlab-org/gitlab-ee!5922
```
  8dca5dcc
- Remove assign merge requests ability from reporter role · 3a7d0fec
  Collen authored May 31, 2018
  
  3a7d0fec
- Resolve another conflict in spec/controllers/application_controller_spec.rb · fe55ece9
  Imre Farkas authored Jun 01, 2018
  
  fe55ece9
- Merge branch '46487-add-support-for-jupyter-in-gitlab-via-kubernetes' into 'master' · d68ded21
  Dmitriy Zaporozhets authored Jun 01, 2018
```
Resolve "Add support for Jupyter in GitLab via Kubernetes"

Closes #46487

See merge request gitlab-org/gitlab-ce!19019
```
  d68ded21
- Merge branch 'rails5-flatten' into 'master' · 83510980
  Grzegorz Bizon authored Jun 01, 2018
```
Fix project team members count

Closes #46283

See merge request gitlab-org/gitlab-ce!19195
```
  83510980
- Resolve conflict in spec/controllers/application_controller_spec.rb · abc69dd2
  Imre Farkas authored Jun 01, 2018
  
  abc69dd2
- Resolve conflict in db/schema.rb · 6ccee496
  Imre Farkas authored Jun 01, 2018
  
  6ccee496
- Resolve conflict in config/routes/project.rb · 1723419b
  Imre Farkas authored Jun 01, 2018
  
  1723419b
- Merge branch '47046-use-sortable-from-npm' into 'master' · 1364dd12
  Phil Hughes authored Jun 01, 2018
```
Use NPM provided version of SortableJS

Closes #47046

See merge request gitlab-org/gitlab-ce!19274
```
  1364dd12
- Merge branch 'ee-47046-use-sortable-from-npm' into 'master' · 985c8443
  Phil Hughes authored Jun 01, 2018
```
EE Port: Use NPM provided version of SortableJS

See merge request gitlab-org/gitlab-ee!5923
```
  985c8443