Commits · 62772e4d55fd24b16d778bfc9897453c42b63bc2 · nexedi / gitlab-ce

06 Jul, 2018 5 commits
- Merge branch 'ce-to-ee-2018-07-06' into 'master' · 62772e4d
  Grzegorz Bizon authored Jul 06, 2018
```
CE upstream - 2018-07-06 00:21 UTC

Closes gitaly#1254, #6753, and #6561

See merge request gitlab-org/gitlab-ee!6401
```
  62772e4d
- Merge branch 'remove-new-contributing-link-from-ee' into 'master' · 9429048d
  Phil Hughes authored Jul 06, 2018
```
Remove new contributing link from EE

Closes gitlab-ce#47274

See merge request gitlab-org/gitlab-ee!6297
```
  9429048d
- Remove new contributing link from EE · 910da80d
  Luke Bennett authored Jul 06, 2018
  
  910da80d
- Update retry_build_service_spec.rb · db07a722
  Francisco Javier López authored Jul 06, 2018
  
  db07a722
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-06 · 2b6dd165
  GitLab Bot authored Jul 06, 2018
```
# Conflicts:
#	spec/services/ci/retry_build_service_spec.rb

[ci skip]
```
  2b6dd165
05 Jul, 2018 35 commits
- Merge branch '48803-mrs-are-showing-some-discussions-as-unresolved' into 'master' · 969b7c56
  Fatih Acet authored Jul 05, 2018
```
Resolve "MRs are showing some discussions as unresolved"

Closes #48803

See merge request gitlab-org/gitlab-ce!20351
```
  969b7c56
- Resolve "MRs are showing some discussions as unresolved" · 9dc6b039
  Simon Knox authored Jul 05, 2018
  
  9dc6b039
- Merge branch 'ce-to-ee-2018-07-05' into 'master' · 3effb9ac
  Robert Speicher authored Jul 05, 2018
```
CE upstream - 2018-07-05 12:27 UTC

Closes charts/gitlab#565 and #4266

See merge request gitlab-org/gitlab-ee!6393
```
  3effb9ac
- Merge branch 'docs-dast-passive-scanning' into 'master' · fde933c2
  Philippe Lafoucrière authored Jul 05, 2018
```
Make clear that DAST is passive scanning only

See merge request gitlab-org/gitlab-ee!6348
```
  fde933c2
- Merge branch 'add-why-gitlab-to-cc-readme' into 'master' · 5e70a094
  Sid Sijbrandij authored Jul 05, 2018
```
Add "Why GitLab?" page to GitLab CE README

See merge request gitlab-org/gitlab-ce!20415
```
  5e70a094
- Merge branch 'ce-6145-unify-issuable-search-bar' into 'master' · dc6c89cc
  Robert Speicher authored Jul 05, 2018
```
CE: Unify app/views/shared/issuable/_search_bar.html.haml

See merge request gitlab-org/gitlab-ce!20266
```
  dc6c89cc
- Merge branch '6145-unify-issuable-search-bar-ee' into 'master' · 8fbb0907
  Robert Speicher authored Jul 05, 2018
```
Unify app/views/shared/issuable/_search_bar.html.haml

Closes #6145

See merge request gitlab-org/gitlab-ee!6327
```
  8fbb0907
- Merge branch... · 48d1f3d6
  Robert Speicher authored Jul 05, 2018
```
Merge branch '48893-getting-undefined-local-variable-or-method-page-for-errors-in-qa-jobs' into 'master'

Resolve "Getting "undefined local variable or method `page' for" errors in QA jobs"

Closes #48893

See merge request gitlab-org/gitlab-ce!20410
```
  48d1f3d6
- Update README.md · e16dcfdf
  Andreas Kämmerle authored Jul 05, 2018
  
  e16dcfdf
- Merge branch 'docs/container-scanning-note' into 'master' · 4d2e24ed
  Achilleas Pipinellis authored Jul 05, 2018
```
Verify version on container scanning note

See merge request gitlab-org/gitlab-ce!20409
```
  4d2e24ed
- Merge branch 'docs/container-scanning-note-ee' into 'master' · 7f79eb86
  Achilleas Pipinellis authored Jul 05, 2018
```
Verify version on container scanning note

See merge request gitlab-org/gitlab-ee!6394
```
  7f79eb86
- Merge branch 'revert-8678cf9b' into 'master' · 1e98a10a
  Grzegorz Bizon authored Jul 05, 2018
```
Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"

See merge request gitlab-org/gitlab-ce!20402
```
  1e98a10a
- Merge branch 'ee-revert-8678cf9b' into 'master' · 19a1584d
  Grzegorz Bizon authored Jul 05, 2018
```
Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"

Closes gitlab-qa#287

See merge request gitlab-org/gitlab-ee!6389
```
  19a1584d
- Merge branch 'increase-capybara-js-timeout' into 'master' · 1cb6ec5c
  Robert Speicher authored Jul 05, 2018
```
Increase capybara JS request timeout

Closes #48837

See merge request gitlab-org/gitlab-ce!20411
```
  1cb6ec5c
- Increase capybara JS request timeout · 7e1b491c
  Jacob Vosmaer (GitLab) authored Jul 05, 2018
  
  7e1b491c
- Merge branch 'go-code-cover' into 'master' · 8d90f9fd
  Kamil Trzciński authored Jul 05, 2018
```
Add Go code coverage

See merge request gitlab-org/gitlab-ce!20359
```
  8d90f9fd
- Merge branch '5960-consider-EE-ahead-of-CE' into 'master' · 587231d2
  Rémy Coutable authored Jul 05, 2018
```
Update CE branch whenever EE is ahead of CE branch

Closes #5960

See merge request gitlab-org/gitlab-ee!5719
```
  587231d2
- Merge branch 'gitaly-timeouts' into 'master' · 760b1476
  Rémy Coutable authored Jul 05, 2018
```
Updated Gitaly timeout values

Closes gitaly#1254

See merge request gitlab-org/gitlab-ce!20259
```
  760b1476
- Updated Gitaly timeout values · 583635f0
  Andrew Newdigate authored Jul 05, 2018
  
  583635f0
- Merge branch 'ee-gitaly-timeouts' into 'master' · f8eba60d
  Rémy Coutable authored Jul 05, 2018
```
Updated Gitaly timeout values

See merge request gitlab-org/gitlab-ee!6391
```
  f8eba60d
- Updated Gitaly timeout values · 435f40c8
  Andrew Newdigate authored Jul 05, 2018
  
  435f40c8
- Merge branch 'dm-invalid-active-service-template' into 'master' · 7eddfef4
  Robert Speicher authored Jul 05, 2018
```
Deactivate new KubernetesService created from active template to prevent project creation from failing

Closes gitlab-ee#6753

See merge request gitlab-org/gitlab-ce!20400
```
  7eddfef4
- Merge branch 'make-issues-base-service-match-ee' into 'master' · 633ac497
  Rémy Coutable authored Jul 05, 2018
```
Make Issues::BaseService match EE

Closes gitlab-ee#6561

See merge request gitlab-org/gitlab-ce!20405
```
  633ac497
- Ensure QA specs are categorized as feature specs by RSpec · 098ecc8b
  Rémy Coutable authored Jul 05, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  098ecc8b
- Merge branch 'docs/api-mention-forked-from' into 'master' · f2bc0723
  Marcia Ramos authored Jul 05, 2018
```
Mention the forked_from_project field in projects API

Closes #41490

See merge request gitlab-org/gitlab-ce!20399
```
  f2bc0723
- Merge branch '6510-es-filter-docs' into 'master' · 0291bc06
  Marcia Ramos authored Jul 05, 2018
```
Add documentation for new search filtering functionality for ES

Closes #6510

See merge request gitlab-org/gitlab-ee!6210
```
  0291bc06
- Verify version on container scanning note · 48e7d497
  Cindy Pallares 🦉 authored Jul 05, 2018
  
  48e7d497
- Verify version on container scanning note · 3f0b1a66
  Cindy Pallares 🦉 authored Jul 05, 2018
  
  3f0b1a66
- Merge branch 'port-c32af9da-to-ce' into 'master' · 8488a39c
  Sean McGivern authored Jul 05, 2018
```
Allow 2 more queries in spec/controllers/projects/pipelines_controller_spec.rb

See merge request gitlab-org/gitlab-ce!20407
```
  8488a39c
- Merge branch 'ee-fj-web-terminal-ci-build' into 'master' · 95c23424
  Douwe Maan authored Jul 05, 2018
```
[Port] Add Web Terminal for CI builds

See merge request gitlab-org/gitlab-ee!6208
```
  95c23424
- Merge branch 'fj-web-terminal-ci-build' into 'master' · dc478a82
  Douwe Maan authored Jul 05, 2018
```
Web Terminal Ci Build

Closes #47116

See merge request gitlab-org/gitlab-ce!19773
```
  dc478a82
- Web Terminal Ci Build · a7a1531f
  Francisco Javier López authored Jul 05, 2018
  
  a7a1531f
- Merge branch 'patch-19' into 'master' · 9a62e72d
  Filipa Lacerda authored Jul 05, 2018
```
fix double "in" in time to artifact deletion

See merge request gitlab-org/gitlab-ce!20357
```
  9a62e72d
- fix double "in" in time to artifact deletion · 7fa509b8
  Ben Bodenmiller authored Jul 05, 2018
  
  7fa509b8
- When no CE branch, find merge-base between CE and HEAD · 6953fb79
  Lin Jen-Shin authored Jul 05, 2018
  
  6953fb79