diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
| commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
| tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /vendor | |
| parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
| download | gitlab-ce-a09983ae35713f5a2bbb100981116d31ce99826e.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/elastic_stack/values.yaml | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 | ||||
| -rw-r--r-- | vendor/licenses.csv | 3 | ||||
| -rw-r--r-- | vendor/project_templates/jsonnet.tar.gz | bin | 0 -> 3857 bytes | |||
| -rw-r--r-- | vendor/project_templates/learn_gitlab.tar.gz | bin | 114701 -> 114312 bytes |
6 files changed, 4 insertions, 3 deletions
diff --git a/vendor/elastic_stack/values.yaml b/vendor/elastic_stack/values.yaml index 21352dd35e2..a6c9fdd39a4 100644 --- a/vendor/elastic_stack/values.yaml +++ b/vendor/elastic_stack/values.yaml @@ -14,8 +14,12 @@ filebeat: filebeatConfig: filebeat.yml: | output.file.enabled: false + setup.ilm.enabled: false + setup.template.name: 'filebeat' + setup.template.pattern: 'filebeat-*' output.elasticsearch: hosts: ["http://elastic-stack-elasticsearch-master:9200"] + index: "filebeat-%{[agent.version]}-%{+yyyy.MM.dd}" filebeat.inputs: - type: container paths: diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore index 259148fa18f..259148fa18f 100755..100644 --- a/vendor/gitignore/C++.gitignore +++ b/vendor/gitignore/C++.gitignore diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore index a1c2a238a96..a1c2a238a96 100755..100644 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore diff --git a/vendor/licenses.csv b/vendor/licenses.csv index c8b305d767d..67db6318b05 100644 --- a/vendor/licenses.csv +++ b/vendor/licenses.csv @@ -227,7 +227,6 @@ chunky_png,1.3.5,MIT cipher-base,1.0.4,MIT citrus,3.0.2,MIT class-utils,0.3.6,MIT -classlist-polyfill,1.2.0,Unlicense cli-cursor,2.1.0,MIT cli-width,2.1.0,ISC clipboard,1.7.1,MIT @@ -447,7 +446,6 @@ follow-redirects,1.2.6,MIT font-awesome-rails,4.7.0.1,"MIT,SIL Open Font License" for-in,1.0.2,MIT formatador,0.2.5,MIT -formdata-polyfill,3.0.11,MIT forwarded,0.1.2,MIT fragment-cache,0.2.1,MIT fresh,0.5.2,MIT @@ -1046,7 +1044,6 @@ strip-json-comments,2.0.1,MIT style-loader,0.23.0,MIT supports-color,2.0.0,MIT supports-color,5.5.0,MIT -svg4everybody,2.1.9,CC0-1.0 symbol-observable,1.2.0,MIT sys-filesystem,1.1.6,Artistic 2.0 tapable,1.1.0,MIT diff --git a/vendor/project_templates/jsonnet.tar.gz b/vendor/project_templates/jsonnet.tar.gz Binary files differnew file mode 100644 index 00000000000..8da4227530a --- /dev/null +++ b/vendor/project_templates/jsonnet.tar.gz diff --git a/vendor/project_templates/learn_gitlab.tar.gz b/vendor/project_templates/learn_gitlab.tar.gz Binary files differindex 249f25bc85c..0eca66b064a 100644 --- a/vendor/project_templates/learn_gitlab.tar.gz +++ b/vendor/project_templates/learn_gitlab.tar.gz |