Commits · 744f72c68c0fec08910dc0aad8bec4b302649b75 · nexedi / gitlab-ce

09 Apr, 2019 39 commits
- Update CHANGELOG-EE.md for 11.7.11-ee · 744f72c6
  GitLab Release Tools Bot authored Apr 09, 2019
```
[ci skip]
```
  744f72c6
- Merge branch 'design-management-empty-state' into 'master' · 3c6b8f8d
  Filipa Lacerda authored Apr 09, 2019
```
Added design management empty state

See merge request gitlab-org/gitlab-ee!10599
```
  3c6b8f8d
- Automatic merge of gitlab-org/gitlab-ce master · f59e53f1
  GitLab Bot authored Apr 09, 2019
  
  f59e53f1
- Merge branch 'winh-jest-no-jasmine-globals' into 'master' · e70fae8d
  Kushal Pandya authored Apr 09, 2019
```
Enable ESLint rule jest/no-jasmine-globals

See merge request gitlab-org/gitlab-ce!27137
```
  e70fae8d
- Merge branch 'winh-jest-no-jasmine-globals-ee' into 'master' · 206e7329
  Kushal Pandya authored Apr 09, 2019
```
Enable ESLint rule jest/no-jasmine-globals (EE-port)

See merge request gitlab-org/gitlab-ee!10650
```
  206e7329
- Merge branch 'ce-6099-move-ee-differences-for-app-views-admin-users-show-html-haml' into 'master' · 48945e92
  Phil Hughes authored Apr 09, 2019
```
CE backport: Move EE differences for `app/views/admin/users/show.html.haml`

Closes gitlab-ee#6099

See merge request gitlab-org/gitlab-ce!26874
```
  48945e92
- Merge branch '6099-move-ee-differences-for-app-views-admin-users-show-html-haml' into 'master' · bfcda510
  Phil Hughes authored Apr 09, 2019
```
Resolve "Move EE differences for `app/views/admin/users/show.html.haml`"

Closes #6099

See merge request gitlab-org/gitlab-ee!10469
```
  bfcda510
- Merge branch '59708-vendor-css' into 'master' · 31ef6f90
  Phil Hughes authored Apr 09, 2019
```
Adds a vendors folder for third party CSS

Closes #59694 and #59708

See merge request gitlab-org/gitlab-ce!27119
```
  31ef6f90
- Adds a vendors folder for third party CSS · 03d17358
  Filipa Lacerda authored Apr 09, 2019
```
Does not run stylelint for the vendors folder
```
  03d17358
- Automatic merge of gitlab-org/gitlab-ce master · a4f92c54
  GitLab Bot authored Apr 09, 2019
  
  a4f92c54
- Merge branch 'note-body-ee-differences' into 'master' · 0bda6cc1
  Filipa Lacerda authored Apr 09, 2019
```
Fixed EE differences in note_body.vue

Closes gitlab-ee#9968

See merge request gitlab-org/gitlab-ce!27126
```
  0bda6cc1
- Merge branch 'note-body-ee-differences-ee' into 'master' · 4ca36f6f
  Filipa Lacerda authored Apr 09, 2019
```
Fixed EE differences in note_body.vue

See merge request gitlab-org/gitlab-ee!10644
```
  4ca36f6f
- Automatic merge of gitlab-org/gitlab-ce master · cd37fa77
  GitLab Bot authored Apr 09, 2019
  
  cd37fa77
- Merge branch 'winh-filtered_search_boards' into 'master' · 8b8f7944
  Phil Hughes authored Apr 09, 2019
```
Remove EE-specific changes from FilteredSearchBoards (CE-backport)

See merge request gitlab-org/gitlab-ce!27122
```
  8b8f7944
- Merge branch 'winh-filtered_search_boards-ee' into 'master' · ab595bbd
  Phil Hughes authored Apr 09, 2019
```
Remove EE-specific changes from FilteredSearchBoards

Closes #10018

See merge request gitlab-org/gitlab-ee!10642
```
  ab595bbd
- Replace jasmine.createSpy() with jest.fn() · e0347ee6
  Winnie Hellmann authored Apr 08, 2019
```
(cherry picked from commit e658b337)
```
  e0347ee6
- Run yarn eslint --fix · 93076c34
  Winnie Hellmann authored Apr 08, 2019
```
(cherry picked from commit cb892da6)
```
  93076c34
- Enable ESLint rule jest/no-jasmine-globals · acfa891e
  Winnie Hellmann authored Apr 08, 2019
```
(cherry picked from commit b28ba16a)
```
  acfa891e
- Merge branch '6669-extract-ee-specific-files-lines-for-ci-cd-spec-requests-api' into 'master' · e4f090df
  Rémy Coutable authored Apr 09, 2019
```
Resolve "Extract EE specific files/lines for CI/CD spec/requests/api"

Closes #6669

See merge request gitlab-org/gitlab-ee!10656
```
  e4f090df
- Replace jasmine.createSpy() with jest.fn() · e658b337
  Winnie Hellmann authored Apr 08, 2019
  
  e658b337
- Run yarn eslint --fix · cb892da6
  Winnie Hellmann authored Apr 08, 2019
  
  cb892da6
- Enable ESLint rule jest/no-jasmine-globals · b28ba16a
  Winnie Hellmann authored Apr 08, 2019
  
  b28ba16a
- Automatic merge of gitlab-org/gitlab-ce master · 993bd778
  GitLab Bot authored Apr 09, 2019
  
  993bd778
- Merge branch 'revert-e4b2c3b0' into 'master' · 5cc1d2f1
  Stan Hu authored Apr 09, 2019
```
Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'"

Closes #60217

See merge request gitlab-org/gitlab-ce!26066
```
  5cc1d2f1
- Merge branch 'issue-58418-release-notes' into 'master' · 498fa739
  Rémy Coutable authored Apr 09, 2019
```
Set Release Name When Adding Release Notes to an Existing Tag

Closes #58418

See merge request gitlab-org/gitlab-ce!26807
```
  498fa739
- Set release name when adding release notes to an existing tag · 5b700328
  Jason Goodman authored Apr 09, 2019
```
Also set the release sha and author
```
  5b700328
- Move EE differences for `app/views/admin/users/show.html.haml` · 33274b22
  Dennis Tang authored Apr 02, 2019
  
  33274b22
- Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'" · 596d5fa2
  Mike Greiling authored Apr 09, 2019
```
This reverts merge request !26015
```
  596d5fa2
- CE port: Move EE differences for `app/views/admin/users/show.html.haml` · a3bbfbae
  Dennis Tang authored Apr 02, 2019
  
  a3bbfbae
- Automatic merge of gitlab-org/gitlab-ce master · 1e47eeda
  GitLab Bot authored Apr 09, 2019
  
  1e47eeda
- Merge branch 'gitlab-managed-apps' into 'master' · 74ac04a6
  Evan Read authored Apr 09, 2019
```
Name GitLab managed apps

See merge request gitlab-org/gitlab-ce!27129
```
  74ac04a6
- Automatic merge of gitlab-org/gitlab-ce master · 5b5942eb
  GitLab Bot authored Apr 09, 2019
  
  5b5942eb
- Merge branch 'fix_qa_auto_devops_ci_masking_variable' into 'master' · 109f6122
  Ramya Authappan authored Apr 09, 2019
```
QA: Change CI value to something that can be masked

See merge request gitlab-org/gitlab-ce!27146
```
  109f6122
- Automatic merge of gitlab-org/gitlab-ce master · 9aa6582d
  GitLab Bot authored Apr 09, 2019
  
  9aa6582d
- Merge branch 'docs-anchors-predefined-variables' into 'master' · 4c301692
  Evan Read authored Apr 09, 2019
```
Docs: Update predefined_variables.md to fix anchor

See merge request gitlab-org/gitlab-ce!27127
```
  4c301692
- Docs: Update predefined_variables.md to fix anchor · a4a73445
  Marcel Amirault authored Apr 09, 2019
  
  a4a73445
- Automatic merge of gitlab-org/gitlab-ce master · 17e0cc93
  GitLab Bot authored Apr 09, 2019
  
  17e0cc93
- Merge branch 'patch-50' into 'master' · b17d459b
  Evan Read authored Apr 09, 2019
```
Update Okta configuration notes

See merge request gitlab-org/gitlab-ce!27076
```
  b17d459b
- Update Okta configuration notes · f7ee6d83
  Blair Lunceford authored Apr 09, 2019
  
  f7ee6d83
08 Apr, 2019 1 commit
- Automatic merge of gitlab-org/gitlab-ce master · 19618d56
  GitLab Bot authored Apr 08, 2019
  
  19618d56