Commits · c416d3c091a564fe0ea2d40b13434bb48104d253 · nexedi / gitlab-ce

16 Feb, 2018 33 commits
- 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
- 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
- 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
- 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
- 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
- Merge branch 'move-issue-reorg' into 'master' · 06004734
  Sean McGivern authored Feb 16, 2018
```
Re-organize issue move method calls

See merge request gitlab-org/gitlab-ce!17146
```
  06004734
- Improve error handling for Gitlab::Profiler and improve doc about providing a user · bda4f081
  Dylan Griffith authored Feb 16, 2018
  
  bda4f081
- Merge branch 'ce-to-ee-2018-02-15' into 'master' · 708de533
  Stan Hu authored Feb 16, 2018
```
CE upstream - 2018-02-15 21:22 UTC

See merge request gitlab-org/gitlab-ee!4564
```
  708de533
15 Feb, 2018 7 commits
- Add axios to frontend docs as the default network request library · 4634e3a1
  Clement Ho authored Feb 15, 2018
  
  4634e3a1
- Merge branch 'users-show-dispatcher-refactor' into 'master' · 1192526b
  Jacob Schatz authored Feb 15, 2018
```
Remove Webpack bundle tag for users:show

See merge request gitlab-org/gitlab-ce!17014
```
  1192526b
- Remove Webpack bundle tag for users:show · a68a2306
  Constance Okoghenun authored Feb 15, 2018
  
  a68a2306
- Merge branch 'fix-compile-assets' into 'master' · 74b8d670
  Jacob Schatz authored Feb 15, 2018
```
Remove duplicate imports

See merge request gitlab-org/gitlab-ee!4566
```
  74b8d670
- Merge branch 'axios-members-ajax' into 'master' · c840e871
  Jacob Schatz authored Feb 15, 2018
```
Replace $.ajax with axios in members.js

See merge request gitlab-org/gitlab-ee!4473
```
  c840e871
- Replace $.ajax with axios in members.js · 989d4535
  Clement Ho authored Feb 15, 2018
  
  989d4535
- Remove duplicate imports · bf9f8040
  Clement Ho authored Feb 15, 2018
  
  bf9f8040