Commits · b69d7d9615af70bbf28c5e3f65e094046bf9b8fd · nexedi / gitlab-ce

11 Dec, 2018 37 commits
- Web IDE terminal documentation · b69d7d96
  Francisco Javier López authored Dec 11, 2018
  
  b69d7d96
- Merge branch 'da-refactor-standard-vulnerability' into 'master' · 46ba8b07
  Kamil Trzciński authored Dec 11, 2018
```
Refactor StandardVulnerability to be less cryptic

See merge request gitlab-org/gitlab-ee!8794
```
  46ba8b07
- Merge branch... · be564fde
  Stan Hu authored Dec 11, 2018
```
Merge branch 'ee-55183-frozenerror-can-t-modify-frozen-string-in-app-mailers-notify-rb' into 'master'

[EE] Fix a potential frozen string error in app/mailers/notify.rb and add tests for Service desk emails

Closes gitlab-ce#55183

See merge request gitlab-org/gitlab-ee!8791
```
  be564fde
- 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
- Refactor StandardVulnerability to be less cryptic · 9d952581
  Douglas Barbosa Alexandre authored Dec 11, 2018
  
  9d952581
- Add tests for the service desk emails · 0371858b
  Rémy Coutable authored Dec 11, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0371858b
- Fix a potential frozen string error in app/mailers/notify.rb · c077a9bd
  Rémy Coutable authored Dec 11, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c077a9bd
- 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' · 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
- 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
- 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
- Merge branch 'sh-revert-mr-22911' into 'master' · 85f430cb
  Grzegorz Bizon authored Dec 11, 2018
```
Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'"

See merge request gitlab-org/gitlab-ce!23715
```
  85f430cb
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-12-11 · 253d9814
  GitLab Bot authored Dec 11, 2018
  
  253d9814
- Merge branch '55138-fix-mr-discussions-count' into 'master' · 97ba7735
  Phil Hughes authored Dec 11, 2018
```
Fix MR discussion counts being off

Closes #55138

See merge request gitlab-org/gitlab-ce!23710
```
  97ba7735
- Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'" · 1bd7f7cb
  Stan Hu authored Dec 10, 2018
```
This reverts commit 793be43b, reversing
changes made to 8d0b4872.

For projects not using any CI, enabling merge only when pipeline succeeds
caused merge requests to be in unmergeable state, which caused significant
confusion.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/55144 for more details.
```
  1bd7f7cb
- Merge branch 'ce-to-ee-2018-12-10' into 'master' · cab246ad
  🤖 GitLab Bot 🤖 authored Dec 11, 2018
```
CE upstream - 2018-12-10 23:21 UTC

See merge request gitlab-org/gitlab-ee!8780
```
  cab246ad
10 Dec, 2018 3 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-12-10 · 4d4f8e29
  GitLab Bot authored Dec 10, 2018
  
  4d4f8e29
- Merge branch 'ce-to-ee-2018-12-10' into 'master' · 24b82282
  🤖 GitLab Bot 🤖 authored Dec 10, 2018
```
CE upstream - 2018-12-10 22:21 UTC

Closes gitlab-ce#55034

See merge request gitlab-org/gitlab-ee!8778
```
  24b82282
- Merge branch '11-6-update-gitignore' into 'master' · 185f8a5d
  Robert Speicher authored Dec 10, 2018
```
Update the .gitignore

See merge request gitlab-org/gitlab-ce!23706
```
  185f8a5d