Commits · f26eafcdd1912a01d7c682c17c8d699c73ab701c · nexedi / gitlab-ce

11 Dec, 2018 40 commits
- Resolved conflicts in doc/api/README.md · f26eafcd
  Yorick Peterse authored Dec 11, 2018
  
  f26eafcd
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-12-11 · c249082f
  GitLab Bot authored Dec 11, 2018
```
# Conflicts:
#	doc/api/README.md

[ci skip]
```
  c249082f
- Merge branch '7788_parse_license_management_reports_in_be-ce' into 'master' · 18a48e34
  Kamil Trzciński authored Dec 11, 2018
```
Generalise test compare service

See merge request gitlab-org/gitlab-ce!22833
```
  18a48e34
- Merge branch 'docs-allow_failure_default_when_manual' into 'master' · de21f227
  Achilleas Pipinellis authored Dec 11, 2018
```
Add note about allow_failure default value for manual jobs

See merge request gitlab-org/gitlab-ce!23685
```
  de21f227
- Merge branch 'similar-issues-docs' into 'master' · e9a10f42
  Victor Wu authored Dec 11, 2018
```
Added docs for similar issues

Closes #55194

See merge request gitlab-org/gitlab-ce!23403
```
  e9a10f42
- Merge branch 'ce-to-ee-2018-12-11' into 'master' · 3ec34997
  🤖 GitLab Bot 🤖 authored Dec 11, 2018
```
CE upstream - 2018-12-11 13:21 UTC

See merge request gitlab-org/gitlab-ee!8792
```
  3ec34997
- Merge branch 'patch-35' into 'master' · 56936cd8
  Achilleas Pipinellis authored Dec 11, 2018
```
Patch 35

See merge request gitlab-org/gitlab-ce!23711
```
  56936cd8
- Patch 35 · 77688b27
  Marceli Wac authored Dec 11, 2018
  
  77688b27
- Merge branch 'docs-nested-storage-paths' into 'master' · 466a10a8
  Achilleas Pipinellis authored Dec 11, 2018
```
Add documentation note about not nesting storage paths

See merge request gitlab-org/gitlab-ce!23722
```
  466a10a8
- Merge branch 'gt-remove-unnecessary-line-before-reply-holder' into 'master' · 71209c91
  Fatih Acet authored Dec 11, 2018
```
Remove boxes around code comments

Closes #54030 and #54058

See merge request gitlab-org/gitlab-ce!23092
```
  71209c91
- Merge branch 'docs/add-missing-resources-and-restructure' into 'master' · b388111f
  Achilleas Pipinellis authored Dec 11, 2018
```
Add missing links to resources

See merge request gitlab-org/gitlab-ce!23605
```
  b388111f
- Merge branch 'docs/add-missing-resources-and-restructure-ee' into 'master' · 59e20557
  Achilleas Pipinellis authored Dec 11, 2018
```
Add missing links to resources

See merge request gitlab-org/gitlab-ee!8720
```
  59e20557
- Add missing links to resources · 2ecb3a1c
  Evan Read authored Dec 11, 2018
  
  2ecb3a1c
- Merge branch 'docs-add-global-nav' into 'master' · 72c1028b
  Achilleas Pipinellis authored Dec 11, 2018
```
Docs: how the global nav works

Closes gitlab-com/gitlab-docs#260

See merge request gitlab-org/gitlab-ce!23065
```
  72c1028b
- Docs: how the global nav works · 98342b7f
  Marcia Ramos authored Dec 11, 2018
  
  98342b7f
- Merge branch 'docs-add-global-nav' into 'master' · 5c2587a8
  Achilleas Pipinellis authored Dec 11, 2018
```
Docs: how the global nav works

See merge request gitlab-org/gitlab-ee!8771
```
  5c2587a8
- Docs: how the global nav works · 45a06a70
  Marcia Ramos authored Dec 11, 2018
  
  45a06a70
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-12-11 · f9ea8040
  GitLab Bot authored Dec 11, 2018
  
  f9ea8040
- Merge branch 'ce-to-ee-2018-12-11' into 'master' · 1918c2f0
  🤖 GitLab Bot 🤖 authored Dec 11, 2018
```
CE upstream - 2018-12-11 12:21 UTC

Closes gitlab-ce#38524

See merge request gitlab-org/gitlab-ee!8789
```
  1918c2f0
- Merge branch 'gt-remove-deprecated-vlink-class' into 'master' · 0f5f1381
  Fatih Acet authored Dec 11, 2018
```
Remove deprecated `vlink` class

See merge request gitlab-org/gitlab-ce!23588
```
  0f5f1381
- Merge branch 'winh-emoji-menu-jest' into 'master' · 955b4b92
  Kushal Pandya authored Dec 11, 2018
```
Migrate emoji_menu_spec.js to Jest

See merge request gitlab-org/gitlab-ce!23688
```
  955b4b92
- Merge branch 'qa-project-ui-updates' into 'master' · 1d87276c
  Rémy Coutable authored Dec 11, 2018
```
Update E2E tests to account for Project overview UI changes

See merge request gitlab-org/gitlab-ce!23366
```
  1d87276c
- Merge branch 'fix-mr-pipelines-run-on-regex' into 'master' · 7e4fcfb0
  Grzegorz Bizon authored Dec 11, 2018
```
Fix MR pipelines run on only: regexp

Closes #55026

See merge request gitlab-org/gitlab-ce!23657
```
  7e4fcfb0
- Merge branch 'more-kubernetes-logs' into 'master' · f03d5817
  Dmitriy Zaporozhets authored Dec 11, 2018
```
Add more structured JSON logging to Kubernetes classes

See merge request gitlab-org/gitlab-ce!23693
```
  f03d5817
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-12-11 · 0085f01a
  GitLab Bot authored Dec 11, 2018
  
  0085f01a
- Automatically restore all Jest mocks after each test · 2c1d4343
  Winnie Hellmann authored Dec 11, 2018
```
see https://jestjs.io/docs/en/configuration.html#restoremocks-boolean
```
  2c1d4343
- Set timeout for Jest to 300ms · 63568626
  Winnie Hellmann authored Dec 10, 2018
  
  63568626
- Fail long running tests · fac4d54f
  Winnie Hellmann authored Sep 06, 2018
  
  fac4d54f
- Move jest.config.js to root directory · ca3603de
  Winnie Hellmann authored Dec 10, 2018
  
  ca3603de
- Move emoji_menu_spec.js to Jest · 5c4cf3b3
  Winnie Hellmann authored Dec 10, 2018
  
  5c4cf3b3
- Merge branch 'ce-to-ee-2018-12-11' into 'master' · f7348f91
  🤖 GitLab Bot 🤖 authored Dec 11, 2018
```
CE upstream - 2018-12-11 10:21 UTC

See merge request gitlab-org/gitlab-ee!8783
```
  f7348f91
- Merge branch 'sh-fix-github-import-without-oauth2-config' into 'master' · 352af3e5
  Rémy Coutable authored Dec 11, 2018
```
Allow GitHub imports via token even if OAuth2 provider not configured

Closes #38524

See merge request gitlab-org/gitlab-ce!23703
```
  352af3e5
- Fix MR pipelines run on only: refex · eb1956c5
  Shinya Maeda authored Dec 07, 2018
  
  eb1956c5
- Generalise test compare service · e6226e8c
  Gilbert Roulot authored Nov 05, 2018
```
It adds a base class for CompareTestReportsService
containing common code with CompareLicenseManagementReportsService
which is present in GitLab Enterprise Edition.
```
  e6226e8c
- Merge branch 'winh-princess-mononospace' into 'master' · 7c4940b7
  Fatih Acet authored Dec 11, 2018
```
Make commit IDs in merge request discussion header monospace

See merge request gitlab-org/gitlab-ce!23562
```
  7c4940b7
- Make commit IDs in merge request discussion header monospace · 1272b5fa
  Winnie Hellmann authored Dec 11, 2018
  
  1272b5fa
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-12-11 · 7978d4d3
  GitLab Bot authored Dec 11, 2018
  
  7978d4d3
- Add documentation note about not nesting storage paths · 67e771b7
  Jacob Vosmaer authored Dec 11, 2018
  
  67e771b7
- Merge branch 'ce-to-ee-2018-12-11' into 'master' · 7df7ecc3
  🤖 GitLab Bot 🤖 authored Dec 11, 2018
```
CE upstream - 2018-12-11 08:21 UTC

See merge request gitlab-org/gitlab-ee!8782
```
  7df7ecc3
- Merge branch 'fix-n-plus-1-queries-projects' into 'master' · 51300f76
  Douwe Maan authored Dec 11, 2018
```
Fix some N+1 queries related to Admin Dashboard, User Dashboards and Activity Stream

Closes #55106

See merge request gitlab-org/gitlab-ce!23034
```
  51300f76