diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-07 09:08:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-07 09:08:26 +0000 |
| commit | 47da68850624438b5b5b9ff9d648b1e83282c446 (patch) | |
| tree | 95f31cd727324ad14cc64e5e5d8b41830cecefe8 /doc | |
| parent | ed922e61f47716d82396490b0a19d794c997b9c5 (diff) | |
| download | gitlab-ce-47da68850624438b5b5b9ff9d648b1e83282c446.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/import.md | 6 | ||||
| -rw-r--r-- | doc/development/service_ping/metrics_instrumentation.md | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/doc/api/import.md b/doc/api/import.md index 5e9fbf30226..8a98e4d7970 100644 --- a/doc/api/import.md +++ b/doc/api/import.md @@ -6,6 +6,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Import API **(FREE)** +Use the Import API to import repositories from GitHub or Bitbucket Server. + ## Import repository from GitHub > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/381902) in GitLab 15.8, GitLab no longer automatically creates namespaces or groups if the namespace or group name specified in `target_namespace` doesn't exist. GitLab also no longer falls back to using the user's personal namespace if the namespace or group name is taken or `target_namespace` is blank. @@ -77,7 +79,7 @@ token: - The GitLab project inherits the original project's visibility settings. As a result, the project is publicly accessible if the original project is public. - If the `path` or `target_namespace` does not exist, the project import fails. -## Cancel GitHub project import +### Cancel GitHub project import > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/364783) in GitLab 15.5. @@ -122,7 +124,7 @@ Returns the following status codes: - `400 Bad Request`: the project import cannot be canceled. - `404 Not Found`: the project associated with `project_id` does not exist. -## Import GitHub gists into GitLab snippets +### Import GitHub gists into GitLab snippets > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/371099) in GitLab 15.8 [with a flag](../administration/feature_flags.md) named `github_import_gists`. Disabled by default. Enabled on GitLab.com. diff --git a/doc/development/service_ping/metrics_instrumentation.md b/doc/development/service_ping/metrics_instrumentation.md index 80500ccc723..14ec4b8c9a6 100644 --- a/doc/development/service_ping/metrics_instrumentation.md +++ b/doc/development/service_ping/metrics_instrumentation.md @@ -154,17 +154,17 @@ end You can use Redis metrics to track events not kept in the database, for example, a count of how many times the search bar has been used. -[Example of a merge request that adds a `Redis` metric](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97009). +[Example of a merge request that adds `Redis` metrics](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103455). The `RedisMetric` class can only be used as the `instrumentation_class` for Redis metrics with simple counters classes (classes that only inherit `BaseCounter` and set `PREFIX` and `KNOWN_EVENTS` constants). In case the counter class has additional logic included in it, a new `instrumentation_class`, inheriting from `RedisMetric`, needs to be created. This new class needs to include the additional logic from the counter class. -Count unique values for `source_code_pushes` event. - Required options: - `event`: the event name. - `prefix`: the value of the `PREFIX` constant used in the counter classes from the `Gitlab::UsageDataCounters` namespace. +Count unique values for `source_code_pushes` event. + ```yaml time_frame: all data_source: redis |