diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 15:07:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 15:07:52 +0000 |
| commit | afe2b984524ae4b0c8a0636db7ec5b2c452f0734 (patch) | |
| tree | 3de39f954c7239e09a9afe84263a64e7042b2b60 /.gitlab | |
| parent | 5a6b36b60502c50ab59c0bc3c345793b70a3d548 (diff) | |
| download | gitlab-ce-afe2b984524ae4b0c8a0636db7ec5b2c452f0734.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/CODEOWNERS | 8 | ||||
| -rw-r--r-- | .gitlab/ci/docs.gitlab-ci.yml | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index a0ee7c456e1..fa87b981f5d 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -48,3 +48,11 @@ Dangerfile @gl-quality/eng-prod # Delivery owner files /.gitlab/ci/releases.gitlab-ci.yml @gitlab-org/delivery + +# Telemetry owner files +/ee/lib/gitlab/usage_data_counters/ @gitlab-org/growth/telemetry +/ee/lib/ee/gitlab/usage_data.rb @gitlab-org/growth/telemetry +/lib/gitlab/grafana_embed_usage_data.rb @gitlab-org/growth/telemetry +/lib/gitlab/usage_data.rb @gitlab-org/growth/telemetry +/lib/gitlab/cycle_analytics/usage_data.rb @gitlab-org/growth/telemetry +/lib/gitlab/usage_data_counters/ @gitlab-org/growth/telemetry diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 08c0efe40db..5b1f375d30e 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -51,7 +51,9 @@ docs lint: script: - scripts/lint-doc.sh # Prepare docs for build - - mv doc/ /tmp/gitlab-docs/content/$DOCS_GITLAB_REPO_SUFFIX + # The path must be 'ee/' because we have hardcoded links relying on it + # https://gitlab.com/gitlab-org/gitlab-docs/-/blob/887850752fc0e72856da6632db132f005ba77f16/content/index.erb#L44-63 + - mv doc/ /tmp/gitlab-docs/content/ee - cd /tmp/gitlab-docs # Build HTML from Markdown - bundle exec nanoc |