diff options
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/packages/maven_repository/index.md | 5 | ||||
-rw-r--r-- | doc/user/permissions.md | 1 | ||||
-rw-r--r-- | doc/user/project/integrations/img/copy_link_to_chart_v12_10.png | bin | 0 -> 21559 bytes | |||
-rw-r--r-- | doc/user/project/integrations/img/generate_link_to_chart.png | bin | 35573 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/integrations/img/panel_context_menu_v12_10.png | bin | 15866 -> 21057 bytes | |||
-rw-r--r-- | doc/user/project/integrations/prometheus.md | 8 | ||||
-rw-r--r-- | doc/user/reserved_names.md | 1 |
7 files changed, 11 insertions, 4 deletions
diff --git a/doc/user/packages/maven_repository/index.md b/doc/user/packages/maven_repository/index.md index 58f0f46052d..b4aec11d029 100644 --- a/doc/user/packages/maven_repository/index.md +++ b/doc/user/packages/maven_repository/index.md @@ -34,6 +34,11 @@ using Maven and understand how to build your own packages, move onto the ### Installing Maven +The required minimum versions are: + +- Java 11.0.5+ +- Maven 3.6+ + Follow the instructions at [maven.apache.org](https://maven.apache.org/install.html) to download and install Maven for your local development environment. Once installation is complete, verify you can use Maven in your terminal by running: diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 4f7284fb05b..55f2e3bbd6c 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -219,6 +219,7 @@ group. | Manage group labels | | ✓ | ✓ | ✓ | ✓ | | Create project in group | | | ✓ (3) | ✓ (3) | ✓ (3) | | Create/edit/delete group milestones | | | ✓ | ✓ | ✓ | +| See a container registry | | ✓ | ✓ | ✓ | ✓ | | Enable/disable a dependency proxy **(PREMIUM)** | | | ✓ | ✓ | ✓ | | Use security dashboard **(ULTIMATE)** | | | ✓ | ✓ | ✓ | | Create subgroup | | | | ✓ (1) | ✓ | diff --git a/doc/user/project/integrations/img/copy_link_to_chart_v12_10.png b/doc/user/project/integrations/img/copy_link_to_chart_v12_10.png Binary files differnew file mode 100644 index 00000000000..fc205240ea5 --- /dev/null +++ b/doc/user/project/integrations/img/copy_link_to_chart_v12_10.png diff --git a/doc/user/project/integrations/img/generate_link_to_chart.png b/doc/user/project/integrations/img/generate_link_to_chart.png Binary files differdeleted file mode 100644 index 03e018969b1..00000000000 --- a/doc/user/project/integrations/img/generate_link_to_chart.png +++ /dev/null diff --git a/doc/user/project/integrations/img/panel_context_menu_v12_10.png b/doc/user/project/integrations/img/panel_context_menu_v12_10.png Binary files differindex e6b0f75406d..096262fea91 100644 --- a/doc/user/project/integrations/img/panel_context_menu_v12_10.png +++ b/doc/user/project/integrations/img/panel_context_menu_v12_10.png diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index 425687d21b8..f8156a484ac 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -624,7 +624,7 @@ The options are: - [View logs](#view-logs-ultimate) - [Download CSV](#downloading-data-as-csv) -- [Generate link to chart](#embedding-gitlab-managed-kubernetes-metrics) +- [Copy link to chart](#embedding-gitlab-managed-kubernetes-metrics) - [Alerts](#setting-up-alerts-for-prometheus-metrics-ultimate) ### View Logs **(ULTIMATE)** @@ -773,9 +773,11 @@ GitLab unfurls the link as an embedded metrics panel: ![Embedded Metrics Rendered](img/embedded_metrics_rendered_v12_8.png) -A single chart may also be embedded. You can generate a link to the chart via the dropdown located on the right side of the chart: +You can also embed a single chart. To get a link to a chart, click the +**{ellipsis_v}** **More info** menu in the upper right corner of the chart, +and select **Copy link to chart**, as shown in this example: -![Generate Link To Chart](img/generate_link_to_chart.png) +![Copy Link To Chart](img/copy_link_to_chart_v12_10.png) The following requirements must be met for the metric to unfurl: diff --git a/doc/user/reserved_names.md b/doc/user/reserved_names.md index 3e53bc0fd81..28dd4c142f7 100644 --- a/doc/user/reserved_names.md +++ b/doc/user/reserved_names.md @@ -55,7 +55,6 @@ Currently the following names are reserved as top level groups: - `apple-touch-icon.png` - `assets` - `autocomplete` -- `ci` - `dashboard` - `deploy.html` - `explore` |