Commits · 2dc3c86d71ee00101a5c34cc90314b54d884870f · nexedi / gitlab-ce

16 Oct, 2018 13 commits
- Add scope to fix namespace issues with Gitlab::BlobHelper · 2dc3c86d
  Stan Hu authored Oct 16, 2018
  
  2dc3c86d
- Merge branch 'master' into ce-to-ee-2018-10-15 · 78c30dfd
  Stan Hu authored Oct 16, 2018
  
  78c30dfd
- Merge branch... · a5c7e0a3
  Phil Hughes authored Oct 16, 2018
```
Merge branch 'ee-49417-improve-settings-pages-design-by-prioritizing-content-group-settings' into 'master'

EE port gitlab-ce!21115

See merge request gitlab-org/gitlab-ee!7720
```
  a5c7e0a3
- EE port gitlab-ce!21115 · 1c65e527
  Luke Bennett authored Oct 16, 2018
  
  1c65e527
- Merge branch 'refactor-test-reports' into 'master' · 7524c068
  Kamil Trzciński authored Oct 16, 2018
```
Refactor test reports

See merge request gitlab-org/gitlab-ee!7827
```
  7524c068
- Refactor test reports · 6b7a726a
  Matija Čupić authored Oct 16, 2018
  
  6b7a726a
- Merge branch '51972-prometheus-not-showing-as-installed-even-though-it-is-ee' into 'master' · 562618d3
  Sean McGivern authored Oct 16, 2018
```
Resolve "Prometheus not showing as installed, even though it is"

See merge request gitlab-org/gitlab-ee!7925
```
  562618d3
- Resolve "Prometheus not showing as installed, even though it is" · 7c613cdf
  Peter Leitzen authored Oct 16, 2018
  
  7c613cdf
- Merge branch '7015-epic-states-notes' into 'master' · 0ea2d5db
  Kamil Trzciński authored Oct 16, 2018
```
Create system notes for epic close and reopen

Closes #7015

See merge request gitlab-org/gitlab-ee!7850
```
  0ea2d5db
- Merge branch 'docs/manual-license-management' into 'master' · 84e95169
  Achilleas Pipinellis authored Oct 16, 2018
```
Add steps for manual license management

Closes #7971

See merge request gitlab-org/gitlab-ee!7920
```
  84e95169
- Enable relative link · c947e9ee
  Evan Read authored Oct 16, 2018
  
  c947e9ee
- Merge branch 'batch_comment_docs' into 'master' · f823fa02
  Evan Read authored Oct 16, 2018
```
Documentation for batch comments

Closes #7893

See merge request gitlab-org/gitlab-ee!7901
```
  f823fa02
- Fix content as per review · c26707d6
  Evan Read authored Oct 16, 2018
  
  c26707d6
15 Oct, 2018 27 commits
- Merge branch 'rails5-fix-vulnerabilities-controller-spec' into 'master' · 63f28859
  Robert Speicher authored Oct 15, 2018
```
Rails5: fix VulnerabilitySummaryEntity

See merge request gitlab-org/gitlab-ee!7893
```
  63f28859
- Remove Linguist from bin/elastic_repo_indexer · 8b919b8c
  Stan Hu authored Oct 15, 2018
  
  8b919b8c
- Documentation for batch comments · ce6b4d97
  Mario de la Ossa authored Oct 11, 2018
```
Adds documentation for the new Merge Request Reviews (batch comments)
feature
```
  ce6b4d97
- Remove use of Blob#language in Ruby indexer · 5296b91e
  Stan Hu authored Oct 15, 2018
  
  5296b91e
- Resolve conflicts in locale/gitlab.pot · dc194da9
  Stan Hu authored Oct 15, 2018
  
  dc194da9
- Merge branch 'ee-replace-i-to-icons-in-vue-components' into 'master' · b958e271
  Clement Ho authored Oct 15, 2018
```
Replace `<i>` in vue components with `<icon>`

See merge request gitlab-org/gitlab-ee!7237
```
  b958e271
- Resolve conflicts in locale/gitlab.pot · bd118d5e
  Stan Hu authored Oct 15, 2018
  
  bd118d5e
- Remove Linguist from Elasticsearch::LiteBlob · d71008c8
  Stan Hu authored Oct 15, 2018
  
  d71008c8
- Resolve conflicts in app/services/clusters/create_service.rb · 02f3dd26
  Stan Hu authored Oct 15, 2018
  
  02f3dd26
- Resolve conflicts in spec/requests/api/settings_spec.rb · 700148be
  Stan Hu authored Oct 15, 2018
  
  700148be
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-15 · 24f22fa2
  GitLab Bot authored Oct 15, 2018
```
# Conflicts:
#	app/services/clusters/create_service.rb
#	locale/gitlab.pot
#	spec/requests/api/settings_spec.rb

[ci skip]
```
  24f22fa2
- Merge branch 'qa-add-a-cop-to-forbit-element-with-pattern-ee' into 'master' · c7177a4c
  Stan Hu authored Oct 15, 2018
```
[EE] Add a new QA::ElementWithPattern cop

Closes gitlab-ce#52516

See merge request gitlab-org/gitlab-ee!7932
```
  c7177a4c
- Merge branch 'sh-remove-koding-ee' into 'master' · a4346644
  Douwe Maan authored Oct 15, 2018
```
Remove Koding integration and documentation (EE port)

Closes gitlab-ce#39697

See merge request gitlab-org/gitlab-ee!7917
```
  a4346644
- Merge branch 'sh-remove-koding' into 'master' · 0602fcb6
  Douwe Maan authored Oct 15, 2018
```
Remove Koding integration and documentation

Closes #39697

See merge request gitlab-org/gitlab-ce!22334
```
  0602fcb6
- Merge branch '52532-unable-to-toggle-issuable-sidebar-out-of-collapsed-state' into 'master' · bf47fc8b
  Clement Ho authored Oct 15, 2018
```
Allow Issue and Merge Request sidebar to be toggled from collapsed state

Closes #52532

See merge request gitlab-org/gitlab-ce!22353
```
  bf47fc8b
- Merge branch 'qa-add-a-cop-to-forbit-element-with-pattern' into 'master' · b8e3a3de
  Stan Hu authored Oct 15, 2018
```
Add a new QA::ElementWithPattern cop

Closes #52516

See merge request gitlab-org/gitlab-ce!22298
```
  b8e3a3de
- Merge branch 'ce-to-ee-2018-10-15' into 'master' · 012892d9
  Robert Speicher authored Oct 15, 2018
```
CE upstream - 2018-10-15 13:22 UTC

See merge request gitlab-org/gitlab-ee!7934
```
  012892d9
- Merge branch 'bvl-merge-base-multiple-revisions' into 'master' · 3c15a20b
  Douwe Maan authored Oct 15, 2018
```
Allow getting the merge base of multiple revisions

Closes #52573

See merge request gitlab-org/gitlab-ce!22295
```
  3c15a20b
- Merge branch 'ready-for-review-doc' into 'master' · 422715b2
  Douwe Maan authored Oct 15, 2018
```
Add documentation how to assign a merge request for review

See merge request gitlab-org/gitlab-ce!21327
```
  422715b2
- Disable the QA/ElementWithPattern cop for EE-specific offenses · 6a1a8247
  Rémy Coutable authored Oct 15, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  6a1a8247
- Disable the QA/ElementWithPattern cop for existing offenses · 1db52c79
  Rémy Coutable authored Oct 15, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1db52c79
- Remove unused eslint disable · 2bbd16e8
  Clement Ho authored Oct 15, 2018
  
  2bbd16e8
- Merge branch 'zj-remove-linguist' into 'master' · f5d088eb
  Robert Speicher authored Oct 15, 2018
```
Remove dependencies on Linguist

Closes #35450

See merge request gitlab-org/gitlab-ce!21008
```
  f5d088eb
- Merge branch '34758-refactor-cluster-services' into 'master' · 201143e9
  Dmitriy Zaporozhets authored Oct 15, 2018
```
Refactor Cluster services to enable groups or projects

See merge request gitlab-org/gitlab-ce!22181
```
  201143e9
- Resolve CHANGELOG.md · ecebd35a
  Robert Speicher authored Oct 15, 2018
  
  ecebd35a
- Merge branch 'ee-34758-refactor-cluster-services' into 'master' · 8e256a8b
  Dmitriy Zaporozhets authored Oct 15, 2018
```
EE: Refactor Cluster services to enable groups or projects

See merge request gitlab-org/gitlab-ee!7876
```
  8e256a8b
- Merge branch '52669-fixes-quick-actions-preview' into 'master' · 5caee568
  Douglas Barbosa Alexandre authored Oct 15, 2018
```
Fixes close/reopen quick actions preview for issues and merge_requests

Closes #52669

See merge request gitlab-org/gitlab-ce!22343
```
  5caee568