Commits · 8a6da07f81e55e225914304e8495fa4b1ea21a51 · nexedi / gitlab-ce

17 Feb, 2018 2 commits
- Merge branch 'ce-to-ee-2018-02-16' into 'master' · 8a6da07f
  Stan Hu authored Feb 17, 2018
```
CE upstream - 2018-02-16 15:23 UTC

Closes gitlab-ce#42939

See merge request gitlab-org/gitlab-ee!4579
```
  8a6da07f
- Merge branch '43345-spec-requests-api-project_import_spec-rb-fails' into 'master' · b6bea6c4
  Sean McGivern authored Feb 16, 2018
```
Resolve "spec/requests/api/project_import_spec.rb fails"

Closes #43345

See merge request gitlab-org/gitlab-ce!17184
```
  b6bea6c4
16 Feb, 2018 38 commits
- Merge branch 'ph-ee-dispatcher' into 'master' · 7c9872f2
  Filipa Lacerda authored Feb 16, 2018
```
Update EE dispatcher routes to be dynamic imports

See merge request gitlab-org/gitlab-ee!4571
```
  7c9872f2
- Update CHANGELOG.md for 10.4.4 · 52f8e015
  Ian Baum authored Feb 16, 2018
```
[ci skip]
```
  52f8e015
- Update CHANGELOG-EE.md for 10.4.4-ee · 9a69868c
  Ian Baum authored Feb 16, 2018
```
[ci skip]
```
  9a69868c
- Merge branch 'move-epic-issue' into 'master' · 548c7601
  Sean McGivern authored Feb 16, 2018
```
Update epic issue when an issue is moved

See merge request gitlab-org/gitlab-ee!4550
```
  548c7601
- Resolve doc conflict · c416d3c0
  Achilleas Pipinellis authored Feb 16, 2018
  
  c416d3c0
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-16 · 842f00b8
  GitLab Bot authored Feb 16, 2018
```
# Conflicts:
#	doc/ci/README.md

[ci skip]
```
  842f00b8
- Merge branch 'prometheus-bundle-tag-refactor' into 'master' · 0433ce38
  Phil Hughes authored Feb 16, 2018
```
Removed prometheus_metrics webpack bundle tag

See merge request gitlab-org/gitlab-ce!17175
```
  0433ce38
- Merge branch '4614-fix-trial-license-expiration-duration' into 'master' · 9090d0c2
  Phil Hughes authored Feb 16, 2018
```
Fix license expiration duration to show trial info only for trial license

Closes #4614

See merge request gitlab-org/gitlab-ee!4573
```
  9090d0c2
- Merge branch '41899-api-endpoint-for-importing-a-project-export' into 'master' · feab47e0
  Sean McGivern authored Feb 16, 2018
```
Resolve "API endpoint for importing a project export"

Closes #41899

See merge request gitlab-org/gitlab-ce!17025
```
  feab47e0
- update docs · 890d7b54
  James Lopez authored Feb 16, 2018
  
  890d7b54
- Merge branch 'asciidoc_inter_document_cross_references' into 'master' · 89854139
  Sean McGivern authored Feb 16, 2018
```
Set Asciidoctor outfilesuffix to default .adoc

Closes #43192 and #17602

See merge request gitlab-org/gitlab-ce!17125
```
  89854139
- Merge branch '4961-sast-text' into 'master' · 9281cf89
  Phil Hughes authored Feb 16, 2018
```
Resolve "SAST report has confusing message in MR widget"

Closes #4961

See merge request gitlab-org/gitlab-ee!4572
```
  9281cf89
- Merge branch 'ce-to-ee-2018-02-16' into 'master' · a8f92895
  Douwe Maan authored Feb 16, 2018
```
CE upstream - 2018-02-16 12:23 UTC

See merge request gitlab-org/gitlab-ee!4574
```
  a8f92895
- Merge branch 'docs/kubernetes-rename' into 'master' · 5a6850c4
  Marcia Ramos authored Feb 16, 2018
```
Replace "Kubernetes cluster" where appropriate in docs

Closes #42939

See merge request gitlab-org/gitlab-ce!17089
```
  5a6850c4
- Merge branch 'docs/kubernetes-rename-ee' into 'master' · b98bd8b8
  Marcia Ramos authored Feb 16, 2018
```
Replace "Kubernetes cluster" where appropriate in docs

Closes gitlab-ce#42939

See merge request gitlab-org/gitlab-ee!4509
```
  b98bd8b8
- Add changelog entry · 5f6a43a3
  Kushal Pandya authored Feb 16, 2018
  
  5f6a43a3
- Add tests for license expiration duration message · 7b7eb2ca
  Kushal Pandya authored Feb 16, 2018
  
  7b7eb2ca
- Show license type in expiration only when applied license type is trial · 9be00fd4
  Kushal Pandya authored Feb 16, 2018
  
  9be00fd4
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-16 · 8b33d6a2
  GitLab Bot authored Feb 16, 2018
  
  8b33d6a2
- Replace "Kubernetes cluster" where appropriate in docs · d52c3e53
  Achilleas Pipinellis authored Feb 13, 2018
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/42939
```
  d52c3e53
- Replace "Kubernetes cluster" where appropriate in docs · 2f817f65
  Achilleas Pipinellis authored Feb 13, 2018
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/42939
```
  2f817f65
- fixed webpack generating too many bundles · df4e243a
  Phil Hughes authored Feb 16, 2018
  
  df4e243a
- Removed prometheus_metrics webpack bundle tag · 523f1f7c
  Constance Okoghenun authored Feb 16, 2018
  
  523f1f7c
- Merge branch 'ee-pipeline-chart-bundle' into 'master' · 24bd2c03
  Filipa Lacerda authored Feb 16, 2018
```
Updated pipelines charts to use dynamic webpack bundle

See merge request gitlab-org/gitlab-ee!4558
```
  24bd2c03
- fixed regex not working for EE · ccce94fd
  Phil Hughes authored Feb 16, 2018
  
  ccce94fd
- Merge branch 'pipeline-chart-bundle' into 'master' · e5ecd9b1
  Filipa Lacerda authored Feb 16, 2018
```
Updated pipelines charts to use dynamic webpack bundle

See merge request gitlab-org/gitlab-ce!17153
```
  e5ecd9b1
- remove pipelines_charts.js · 17ba0e76
  Phil Hughes authored Feb 16, 2018
  
  17ba0e76
- Merge branch 'docs-axios' into 'master' · 241ece87
  Filipa Lacerda authored Feb 16, 2018
```
Add axios to frontend docs as the default network request library

See merge request gitlab-org/gitlab-ce!17165
```
  241ece87
- Update epic issue when an issue is moved · 1a128382
  Jan Provaznik authored Feb 14, 2018
```
The existing epic issue is updated instead of creating a new epic issue
- there is no reason to keep reference both to old and new issues.

Related gitlab-ce#41949
```
  1a128382
- Improve SAST message · 8b267f8a
  Filipa Lacerda authored Feb 16, 2018
  
  8b267f8a
- deleted pipelines_charts file · d74c63e6
  Phil Hughes authored Feb 16, 2018
```
it is no longer used now that all the pipeline chart stuff is in 1 file
```
  d74c63e6
- Merge branch '43247-eslint-exception-for-links' into 'master' · c94f25e1
  Phil Hughes authored Feb 16, 2018
```
Add ESLint exception for `_links` property

Closes #43247

See merge request gitlab-org/gitlab-ce!17170
```
  c94f25e1
- Merge branch 'ce-to-ee-2018-02-16' into 'master' · 2becedf6
  Marin Jankovski authored Feb 16, 2018
```
CE upstream - 2018-02-16 09:23 UTC

See merge request gitlab-org/gitlab-ee!4570
```
  2becedf6
- Ignore `_links` property for no-underscore-dangle rule · f80c5730
  Kushal Pandya authored Feb 16, 2018
  
  f80c5730
- Update EE dispatcher routes to be dynamic imports · a011aed0
  Phil Hughes authored Feb 16, 2018
```
https://gitlab.com/gitlab-org/gitlab-ce/issues/41341
```
  a011aed0
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-16 · 33592b8d
  GitLab Bot authored Feb 16, 2018
  
  33592b8d
- Merge branch 'update-profiler-docs-explaining-how-to-provide-user' into 'master' · 049d2cc4
  Sean McGivern authored Feb 16, 2018
```
Add documentation about how to provide a user to Gitlab::Profiler

See merge request gitlab-org/gitlab-ce!17169
```
  049d2cc4
- Merge branch 'dm-escape-commit-message' into 'master' · 27b71e80
  Sean McGivern authored Feb 16, 2018
```
Escape HTML entities in commit messages

Closes #42833

See merge request gitlab-org/gitlab-ce!17144
```
  27b71e80