Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/clusters/forms/show/index.js3
-rw-r--r--app/helpers/clusters_helper.rb6
-rw-r--r--app/views/clusters/clusters/_integrations.html.haml16
-rw-r--r--app/views/clusters/clusters/_integrations_tab.html.haml4
-rw-r--r--app/views/clusters/clusters/show.html.haml1
-rw-r--r--doc/architecture/blueprints/ci_pipeline_components/index.md3
-rw-r--r--doc/development/internal_users.md1
-rw-r--r--doc/user/admin_area/settings/account_and_limit_settings.md16
-rw-r--r--doc/user/enterprise_user/index.md44
-rw-r--r--doc/user/group/manage.md2
-rw-r--r--doc/user/project/members/share_project_with_groups.md1
-rw-r--r--doc/user/project/repository/code_suggestions.md160
-rw-r--r--locale/gitlab.pot12
-rw-r--r--package.json2
-rw-r--r--qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb6
-rw-r--r--spec/frontend/releases/components/releases_pagination_spec.js15
-rw-r--r--spec/helpers/clusters_helper_spec.rb15
-rw-r--r--yarn.lock8
18 files changed, 203 insertions, 112 deletions
diff --git a/app/assets/javascripts/clusters/forms/show/index.js b/app/assets/javascripts/clusters/forms/show/index.js
index 102b240042f..3cb4376f41a 100644
--- a/app/assets/javascripts/clusters/forms/show/index.js
+++ b/app/assets/javascripts/clusters/forms/show/index.js
@@ -1,11 +1,8 @@
import Vue from 'vue';
-import dirtySubmitFactory from '~/dirty_submit/dirty_submit_factory';
import IntegrationForm from '../components/integration_form.vue';
import { createStore } from '../stores';
export default () => {
- dirtySubmitFactory(document.querySelectorAll('.js-cluster-integrations-form'));
-
const entryPoint = document.querySelector('#js-cluster-details-form');
if (!entryPoint) {
diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb
index 458d81b3401..5c410a28229 100644
--- a/app/helpers/clusters_helper.rb
+++ b/app/helpers/clusters_helper.rb
@@ -57,12 +57,6 @@ module ClustersHelper
render_if_exists 'clusters/clusters/environments'
when 'apps'
render 'applications'
- when 'integrations'
- if Feature.enabled?(:remove_monitor_metrics)
- render('details', expanded: expanded)
- else
- render 'integrations'
- end
when 'settings'
render 'advanced_settings_container'
else
diff --git a/app/views/clusters/clusters/_integrations.html.haml b/app/views/clusters/clusters/_integrations.html.haml
deleted file mode 100644
index 4d36c5094a3..00000000000
--- a/app/views/clusters/clusters/_integrations.html.haml
+++ /dev/null
@@ -1,16 +0,0 @@
-.settings.expanded.border-0.m-0
- %p
- = s_('ClusterIntegration|Integrations allow you to use applications installed in your cluster as part of your GitLab workflow.')
- = link_to _('Learn more'), help_page_path('user/clusters/integrations.md'), target: '_blank', rel: 'noopener noreferrer'
- .settings-content#integrations-settings-section
- - if can?(current_user, :admin_cluster, @cluster)
- .sub-section.form-group
- = gitlab_ui_form_for @prometheus_integration, as: :integration, namespace: :prometheus, url: @cluster.integrations_path, method: :post, html: { class: 'js-cluster-integrations-form' } do |prometheus_form|
- = prometheus_form.hidden_field :application_type, value: @prometheus_integration.application_type
- .form-group.gl-form-group
- - help_text = s_('ClusterIntegration|Allows GitLab to query a specifically configured in-cluster Prometheus for metrics.')
- - help_link = link_to(_('More information.'), help_page_path("user/clusters/integrations"), target: '_blank', rel: 'noopener noreferrer')
- = prometheus_form.gitlab_ui_checkbox_component :enabled,
- s_('ClusterIntegration|Enable Prometheus integration'),
- help_text: '%{help_text} %{help_link}'.html_safe % { help_text: help_text, help_link: help_link }
- = prometheus_form.submit _('Save changes'), class: 'btn gl-button btn-confirm'
diff --git a/app/views/clusters/clusters/_integrations_tab.html.haml b/app/views/clusters/clusters/_integrations_tab.html.haml
deleted file mode 100644
index e229c1fbe1e..00000000000
--- a/app/views/clusters/clusters/_integrations_tab.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-- active = params[:tab] == 'integrations'
-
-= gl_tab_link_to clusterable.cluster_path(@cluster.id, params: { tab: 'integrations' }), { item_active: active } do
- = _('Integrations')
diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml
index 57de6d980f8..1287f4e689f 100644
--- a/app/views/clusters/clusters/show.html.haml
+++ b/app/views/clusters/clusters/show.html.haml
@@ -32,7 +32,6 @@
= gl_tabs_nav do
= render 'clusters/clusters/details_tab'
= render_if_exists 'clusters/clusters/environments_tab'
- = render 'clusters/clusters/integrations_tab' if !Feature.enabled?(:remove_monitor_metrics)
= render 'clusters/clusters/advanced_settings_tab'
.tab-content.py-3
diff --git a/doc/architecture/blueprints/ci_pipeline_components/index.md b/doc/architecture/blueprints/ci_pipeline_components/index.md
index 667c8d225db..88c24e01a6c 100644
--- a/doc/architecture/blueprints/ci_pipeline_components/index.md
+++ b/doc/architecture/blueprints/ci_pipeline_components/index.md
@@ -12,6 +12,9 @@ participating-stages: []
# CI/CD Catalog
+NOTE:
+This document covers the future plans for the CI/CD Catalog feature. For information on the features already available for use in GitLab, see the [CI/CD Components documentation](../../../ci/components/index.md).
+
## Summary
## Goals
diff --git a/doc/development/internal_users.md b/doc/development/internal_users.md
index ce13324507d..d9f40d6f5d4 100644
--- a/doc/development/internal_users.md
+++ b/doc/development/internal_users.md
@@ -40,6 +40,7 @@ For this bot:
Other examples of internal users:
+- [GitLab Admin Bot](https://gitlab.com/gitlab-org/gitlab/-/blob/278bc9018dd1515a10cbf15b6c6cd55cb5431407/app/models/user.rb#L950-960)
- [Alert Bot](../operations/incident_management/alerts.md#trigger-actions-from-alerts)
- [Ghost User](../user/profile/account/delete_account.md#associated-records)
- [Support Bot](../user/project/service_desk.md#support-bot-user)
diff --git a/doc/user/admin_area/settings/account_and_limit_settings.md b/doc/user/admin_area/settings/account_and_limit_settings.md
index 293decc438e..ae0dc184bc7 100644
--- a/doc/user/admin_area/settings/account_and_limit_settings.md
+++ b/doc/user/admin_area/settings/account_and_limit_settings.md
@@ -18,7 +18,7 @@ To configure the maximum number of projects in personal namespaces for new users
1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
1. Select **Admin Area**.
-1. Select **Settings > Network**.
+1. Select **Settings > General**.
1. Expand **Account and limit**.
1. Increase or decrease that **Default projects limit** value.
@@ -46,7 +46,7 @@ To change the maximum attachment size:
1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
1. Select **Admin Area**.
-1. Select **Settings > Network**.
+1. Select **Settings > General**.
1. Expand **Account and limit**.
1. Increase or decrease by changing the value in **Maximum attachment size (MB)**.
@@ -62,7 +62,7 @@ You can change the maximum push size for your instance:
1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
1. Select **Admin Area**.
-1. Select **Settings > Network**.
+1. Select **Settings > General**.
1. Expand **Account and limit**.
1. Increase or decrease by changing the value in **Maximum push size (MB)**.
@@ -94,7 +94,7 @@ To modify the maximum file size for imports in GitLab:
1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
1. Select **Admin Area**.
-1. Select **Settings > Network**.
+1. Select **Settings > General**.
1. Expand **Account and limit**.
1. Increase or decrease by changing the value in **Maximum import size (MB)**.
@@ -317,7 +317,7 @@ To do this:
1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
1. Select **Admin Area**.
-1. Select **Settings > Network**.
+1. Select **Settings > General**.
1. Expand **Account and limit**.
1. Select the **Prevent users from changing their profile name** checkbox.
@@ -339,7 +339,7 @@ By default, new users can create top-level groups. GitLab administrators can pre
1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
1. Select **Admin Area**.
-1. Select **Settings > Network**.
+1. Select **Settings > General**.
1. Expand **Account and limit**.
1. Clear the **Allow new users to create top-level groups** checkbox.
@@ -351,7 +351,7 @@ By default, newly created users have a public profile. GitLab administrators can
1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
1. Select **Admin Area**.
-1. Select **Settings > Network**.
+1. Select **Settings > General**.
1. Expand **Account and limit**.
1. Select the **Make new users' profiles private by default** checkbox.
@@ -364,7 +364,7 @@ users from deleting their own accounts:
1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
1. Select **Admin Area**.
-1. Select **Settings > Network**.
+1. Select **Settings > General**.
1. Expand **Account and limit**.
1. Clear the **Allows users to delete their own accounts** checkbox.
diff --git a/doc/user/enterprise_user/index.md b/doc/user/enterprise_user/index.md
index 36f698daf81..ea320402dd7 100644
--- a/doc/user/enterprise_user/index.md
+++ b/doc/user/enterprise_user/index.md
@@ -47,17 +47,29 @@ Prerequisites:
- A project in the group.
- You must have the Owner role in the top-level group.
-Setting up a verified domain is similar to [setting up a custom domain on GitLab Pages](../project/pages/custom_domains_ssl_tls_certification/index.md). However, you must:
+Domain verification applies at the top-level group and to all subgroups and projects
+nested under that top-level parent group.
-- Link the domain to a single project.
-- Configure the `TXT` only in the DNS record to verify the domain's ownership.
+Setting up a verified domain is similar to [setting up a custom domain on GitLab Pages](../project/pages/custom_domains_ssl_tls_certification/index.md). However, you:
-Domain verification is tied to the project you choose. A project is required because domain verification reuses the GitLab Pages verification feature, which requires a project. Domain verification applies at the top-level group and to all subgroups and projects nested under that top-level parent group.
-A member in the chosen project with [at least the Maintainer role](../permissions.md#project-members-permissions) can modify or remove the domain verification.
-If needed, you can create a new project to set up domain verification directly under your top-level group. This limits the ability to modify the domain verification to members with at least the Maintainer role.
-For more information on group-level domain verification, see [epic 5299](https://gitlab.com/groups/gitlab-org/-/epics/5299).
+- Do not need to have a GitLab Pages website.
+- Must link the domain to a single project, despite domain verification applying
+ at the top-level group and to all nested subgroups and projects, because domain
+ verification:
+ - Is tied to the project you choose.
+ - Reuses the GitLab Pages custom domain verification feature, which requires a project.
+- Must configure the `TXT` only in the DNS record to verify the domain's ownership.
+
+In addition to appearing in the top-level group Domain Verification list, the
+domain will also appear in the chosen project. A member in this project with
+[at least the Maintainer role](../permissions.md#project-members-permissions)
+can modify or remove the domain verification.
-Steps:
+If needed, you can create a new project to set up domain verification directly
+under your top-level group. This limits the ability to modify the domain verification
+to members with at least the Maintainer role.
+
+For more information on group-level domain verification, see [epic 5299](https://gitlab.com/groups/gitlab-org/-/epics/5299).
#### 1. Add a custom domain for the matching email domain
@@ -96,21 +108,13 @@ After you have added all the DNS records:
![Verify your domain](../img/retry_domain_verification_v16_0.png)
WARNING:
-For GitLab instances with domain verification enabled,
-if the domain cannot be verified for 7 days, that domain is removed
-from the GitLab project.
+For GitLab instances with domain verification enabled, if the domain cannot be verified for 7 days, that domain is removed from the GitLab project.
> **Notes:**
>
-> - Domain verification is **required for GitLab.com users**;
- for GitLab self-managed instances, your GitLab administrator has the option
- to [disabled custom domain verification](../../administration/pages/index.md#custom-domain-verification).
-> - [DNS propagation may take some time (up to 24 hours)](https://www.inmotionhosting.com/support/domain-names/dns-nameserver-changes/complete-guide-to-dns-records/),
- although it's usually a matter of minutes to complete. Until it does, verification
- fails, and attempts to visit your domain result in a 404.
-> - Once your domain has been verified, leave the verification record
- in place. Your domain is periodically reverified, and may be
- disabled if the record is removed.
+> - Domain verification is **required for GitLab.com users** to be marked as enterprise users.
+> - [DNS propagation can take up to 24 hours](https://www.inmotionhosting.com/support/domain-names/dns-nameserver-changes/complete-guide-to-dns-records/), although it's usually a couple of minutes to complete. Until it completes, the domain shows as unverified.
+> - Once your domain has been verified, leave the verification record in place. Your domain is periodically reverified, and may be disabled if the record is removed.
> - A valid certificate is not required for domain verification.
### View domains in group
diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md
index 284fb8b3d7c..1de2f075592 100644
--- a/doc/user/group/manage.md
+++ b/doc/user/group/manage.md
@@ -131,7 +131,7 @@ After sharing the `Frontend` group with the `Engineering` group:
- The **Groups** tab lists the `Engineering` group.
- The **Groups** tab lists a group regardless of whether it is a public or private group.
- All direct members of the `Engineering` group have access to the `Frontend` group. Direct members of `Engineering` that gain access to the `Frontend` group keep their same access level as in `Engineering`, but up to the maximum access level selected when sharing the group. Inherited members of the `Engineering` group do not gain access to the `Frontend` group.
-- All direct members of the `Engineering` group count towards the billable members of the `Frontend` group.
+- Direct members of the `Engineering` group who have the **Group Invite** badge next to their profile on the group's usage quota page count towards the billable members of the `Frontend` group.
## Remove a shared group
diff --git a/doc/user/project/members/share_project_with_groups.md b/doc/user/project/members/share_project_with_groups.md
index aadc27fb2d3..15c5935648f 100644
--- a/doc/user/project/members/share_project_with_groups.md
+++ b/doc/user/project/members/share_project_with_groups.md
@@ -76,6 +76,7 @@ In addition:
- On the group's page, the project is listed on the **Shared projects** tab.
- On the project's **Members** page, the group is listed on the **Groups** tab.
- Each user is assigned a maximum role.
+- Members who have the **Project Invite** badge next to their profile on the usage quota page count towards the billable members of the shared project's top-level group.
## Maximum role
diff --git a/doc/user/project/repository/code_suggestions.md b/doc/user/project/repository/code_suggestions.md
index dd1fa3f4c8b..33ef10c9c3d 100644
--- a/doc/user/project/repository/code_suggestions.md
+++ b/doc/user/project/repository/code_suggestions.md
@@ -5,17 +5,18 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: index, reference
---
-# Code Suggestions (Beta) **(FREE SAAS)**
+# Code Suggestions (Beta) **(FREE)**
-> - [Introduced](https://about.gitlab.com/releases/2023/02/22/gitlab-15-9-released/#code-suggestions-available-in-closed-beta) in GitLab 15.9 as [Beta](/ee/policy/experiment-beta-support.md#beta) for early access Ultimate customers.
-> - [Enabled](https://gitlab.com/gitlab-org/gitlab/-/issues/408104) as opt-in with GitLab 15.11 as [Beta](/ee/policy/experiment-beta-support.md#beta).
+> - [Introduced](https://about.gitlab.com/releases/2023/02/22/gitlab-15-9-released/#code-suggestions-available-in-closed-beta) in GitLab 15.9 as [Beta](../../../policy/experiment-beta-support.md#beta) for early access Ultimate customers on GitLab.com.
+> - [Enabled](https://gitlab.com/gitlab-org/gitlab/-/issues/408104) as opt-in with GitLab 15.11 as [Beta](../../../policy/experiment-beta-support.md#beta).
> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/408158) from GitLab Ultimate to GitLab Premium in 16.0.
> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/410801) from GitLab Premium to GitLab Free in 16.0.
> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121079) in GitLab 16.1.
> - [Default to third-party AI services](https://gitlab.com/groups/gitlab-org/-/epics/10562) in GitLab 16.1.
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10653) in GitLab 16.1 as [Beta](../../../policy/experiment-beta-support.md#beta) on self-managed GitLab.
WARNING:
-This feature is in [Beta](/ee/policy/experiment-beta-support.md#beta).
+This feature is in [Beta](../../../policy/experiment-beta-support.md#beta).
Due to high demand, this feature may have unscheduled downtime and Code Suggestions in IDEs may be delayed.
Code Suggestions may produce [low-quality or incomplete suggestions](#model-accuracy-and-quality).
Beta users should read about the [known limitations](#known-limitations). We look forward to hearing your feedback.
@@ -50,9 +51,15 @@ We are making improvements to the Code Suggestions underlying AI model weekly to
Usage of Code Suggestions is governed by the [GitLab Testing Agreement](https://about.gitlab.com/handbook/legal/testing-agreement/). Learn about [data usage when using Code Suggestions](#code-suggestions-data-usage).
-## Enable Code Suggestions for an individual user
+Code Suggestions are available on both GitLab SaaS and self-managed GitLab.
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121079) in GitLab 16.1 as [Beta](/ee/policy/experiment-beta-support.md#beta).
+## Enable Code Suggestions on GitLab SaaS **(FREE SAAS)**
+
+There are different scenarios in which you can enable code suggestions.
+
+### Enable Code Suggestions for an individual user
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121079) in GitLab 16.1 as [Beta](../../../policy/experiment-beta-support.md#beta).
Each user can enable Code Suggestions for themselves:
@@ -64,7 +71,7 @@ Each user can enable Code Suggestions for themselves:
NOTE:
If Code Suggestions is [enabled for the group](../../group/manage.md#enable-code-suggestions), the group setting overrides the user setting.
-## Enable Code Suggestions in WebIDE
+### Enable Code Suggestions in WebIDE
Prerequisites:
@@ -72,12 +79,14 @@ Prerequisites:
- Code Suggestions must be [enabled for your user account](#enable-code-suggestions-for-an-individual-user).
- You must be a GitLab team member.
-Code Suggestions work automatically in the [GitLab WebIDE](../../project/web_ide/index.md) if the above prerequisites are met. To disable Code Suggestions in the WebIDE, disable the user account setting.
+Code Suggestions work automatically in the GitLab WebIDE if the prerequisites are met.
+
+To disable Code Suggestions in the WebIDE, disable the user account setting.
NOTE:
Disabling in the WebIDE will also disable in any other IDEs you use locally like VS Code. Support for [more granular control per IDE](https://gitlab.com/groups/gitlab-org/-/epics/10624) is proposed.
-## Enable Code Suggestions in VS Code
+### Enable Code Suggestions in VS Code
Prerequisites:
@@ -85,15 +94,115 @@ Prerequisites:
- Code Suggestions must be [enabled for your user account](#enable-code-suggestions-for-an-individual-user).
- Completed the [setup instructions](https://gitlab.com/gitlab-org/gitlab-vscode-extension#setup) for the GitLab Visual Studio Code Extension.
-To enable Code Suggestions in VS Code:
+Start typing in VS Code and you receive suggestions for your GitLab projects.
+
+<div class="video-fallback">
+ See an end-to-end demo: <a href="https://www.youtube.com/watch?v=WnxBYxN2-p4">Get started with GitLab Code Suggestions in VS Code</a>.
+</div>
+<figure class="video-container">
+ <iframe src="https://www.youtube-nocookie.com/embed/WnxBYxN2-p4" frameborder="0" allowfullscreen> </iframe>
+</figure>
+
+## Enable Code Suggestions on self-managed GitLab **(FREE SELF)**
+
+> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10653) in GitLab 16.1 as [Beta](../../../policy/experiment-beta-support.md#beta).
+
+To enable Code Suggestions on a self-managed GitLab instance:
+
+- The instance administrator enables Code Suggestions for the instance.
+- The user enables Code Suggestions in Visual Studio (VS) Code.
-1. Download and install the
- [GitLab Workflow extension](https://marketplace.visualstudio.com/items?itemName=GitLab.gitlab-workflow)
- for Visual Studio Code.
-1. Complete the [setup instructions](https://gitlab.com/gitlab-org/gitlab-vscode-extension#setup) for the extension.
-1. After your GitLab account connects successfully, in the left sidebar, select **Extensions**.
-1. Find the **GitLab workflow** extension, select **Settings** (**{settings}**), and select **Extension Settings**.
-1. Enable **GitLab > AI Assisted Code Suggestions**.
+### Enable Code Suggestions for the instance
+
+Prerequisites:
+
+You must:
+
+- Be an administrator for your self-managed instance.
+- Have a [GitLab SaaS account](https://gitlab.com/users/sign_up).
+ You do not need to have a GitLab SaaS subscription.
+
+You, as an administrator, must:
+
+1. Enable Code Suggestions:
+ - In your SaaS account.
+ - At the self-managed instance level.
+1. Request early access to the Code Suggestions Beta for self-managed instances.
+
+#### Enable Code Suggestions in your GitLab SaaS account
+
+In your GitLab SaaS account:
+
+1. Create a [personal access token](../../profile/personal_access_tokens.md#create-a-personal-access-token)
+ with the `api` scope.
+1. On the left sidebar, select your avatar.
+1. Select **Preferences**.
+1. In the **Code Suggestions** section, select **Enable Code Suggestions**.
+1. Select **Save changes**.
+
+#### Enable Code Suggestions in your self-managed GitLab instance
+
+In your self-managed GitLab instance:
+
+1. On the left sidebar, expand the top-most chevron (**{chevron-down}**).
+1. Select **Admin Area**.
+1. On the left sidebar, select **Settings > General**.
+1. Expand **Code Suggestions** and:
+ - Select **Turn on Code Suggestions for this instance**.
+ - In **Personal access token**, enter your GitLab SaaS personal access token.
+1. Select **Save changes**.
+
+This setting is only visible in self-managed GitLab instances.
+
+By turning on this feature, you:
+
+- Agree to the [GitLab testing agreement](https://about.gitlab.com/handbook/legal/testing-agreement/).
+- Acknowledge that GitLab:
+ - Sends data from the instance, including personal data, to Google for cloud hosting.
+ - Might send data to third-party AI providers.
+
+WARNING:
+If you clear the **Turn on code suggestions for this instance** checkbox, the users in your instance can still use Code Suggestions for up to one hour, until the issued JSON web token (JWT) expires.
+
+#### Request access to Code Suggestions
+
+GitLab provisions access on a customer-by-customer basis for Code Suggestions
+on self-managed instances. To request access:
+
+1. Sign into your GitLab SaaS account.
+1. Comment on [issue 415393](https://gitlab.com/gitlab-org/gitlab/-/issues/415393)
+ and tag your customer success manager.
+
+After GitLab has provisioned access to Code Suggestions for your instance,
+the users in your instance can now enable Code Suggestions in VS Code.
+
+### Enable Code Suggestions in WebIDE
+
+Prerequisites:
+
+- Code Suggestions must be [enabled for the top-level group](../../group/manage.md#enable-code-suggestions).
+- Code Suggestions must be [enabled for your user account](#enable-code-suggestions-for-an-individual-user).
+- You are a GitLab team member.
+
+You should check that AI assisted code suggestions in the
+[GitLab WebIDE](../../project/web_ide/index.md) are enabled:
+
+1. In the left sidebar, select **Extensions > GitLab Workflow**.
+1. Select **Settings** (**{settings}**), and then select **Extension Settings**.
+1. In **GitLab > AI Assisted Code Suggestions**, select the **Enable code completion (Beta)**
+ checkbox.
+
+### Enable Code Suggestions in VS Code
+
+Prerequisites:
+
+- You are a user in a self-managed instance.
+- Your instance administrator has enabled Code Suggestions for the instance.
+
+To use Code Suggestions in your self-managed instance,
+[enable it in VS Code](#enable-code-suggestions-in-vs-code).
+
+To start using Code Suggestions with your GitLab project, open your GitLab project in VS Code.
Start typing and receive suggestions for your GitLab projects.
@@ -130,7 +239,7 @@ To confirm that your account is enabled, go to [https://gitlab.com/api/v4/ml/ai-
If the above steps do not solve your issue, the problem may be related to the recent changes in authentication, specifically the token system. To resolve the issue, please follow these troubleshooting steps:
- Remove the existing PAT from your GitLab account settings.
-- Reauthorize your GitLab account in VSCode using OAuth.
+- Reauthorize your GitLab account in VS Code using OAuth.
- Test the code suggestions feature with different file extensions to verify if the issue is resolved.
## Third-party AI services controls
@@ -143,7 +252,7 @@ To use Code Suggestions entirely within GitLab’s cloud infrastructure, disable
## Stability and performance
-This feature is currently in [Beta](/ee/policy/experiment-beta-support.md#beta).
+This feature is currently in [Beta](../../../policy/experiment-beta-support.md#beta).
While the Code Suggestions inference API operates completely within the GitLab.com enterprise infrastructure,
we expect a high demand for this Beta feature, which may cause degraded performance or unexpected downtime
of the feature. We have built this feature to gracefully degrade and have controls in place to allow us to
@@ -173,6 +282,19 @@ Your data also never leaves GitLab.com. All training and inference is done in Gi
[Read more about the security of GitLab.com](https://about.gitlab.com/security/faq/).
+### Self-managed instance data privacy
+
+A self-managed GitLab instance does not generate the code suggestion. After successful
+authentication to the self-managed instance, a token is generated.
+
+The VS Code plugin then uses this token to securely transmit data directly to
+GitLab.com's Code Suggestions service for processing.
+
+The Code Suggestion service then securely returns an AI-generated code suggestion.
+
+GitLab does not have any visibility into a self-managed customer's code other than
+what is sent to generate the code suggestion.
+
### Training data
This section applies only to customers who have third-party AI services disabled.
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index e10cdc26da9..3cd30a587d8 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -10692,9 +10692,6 @@ msgstr ""
msgid "ClusterIntegration|Allow GitLab to manage namespaces and service accounts for this cluster."
msgstr ""
-msgid "ClusterIntegration|Allows GitLab to query a specifically configured in-cluster Prometheus for metrics."
-msgstr ""
-
msgid "ClusterIntegration|Amazon EKS"
msgstr ""
@@ -10779,9 +10776,6 @@ msgstr ""
msgid "ClusterIntegration|Elastic Kubernetes Service"
msgstr ""
-msgid "ClusterIntegration|Enable Prometheus integration"
-msgstr ""
-
msgid "ClusterIntegration|Enable or disable GitLab's connection to your Kubernetes cluster."
msgstr ""
@@ -10842,9 +10836,6 @@ msgstr ""
msgid "ClusterIntegration|Integration enabled"
msgstr ""
-msgid "ClusterIntegration|Integrations allow you to use applications installed in your cluster as part of your GitLab workflow."
-msgstr ""
-
msgid "ClusterIntegration|Kubernetes cluster is being created..."
msgstr ""
@@ -29594,9 +29585,6 @@ msgstr ""
msgid "More information is available|here"
msgstr ""
-msgid "More information."
-msgstr ""
-
msgid "More options"
msgstr ""
diff --git a/package.json b/package.json
index e679bed69c5..b07e86aba2e 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
"@gitlab/favicon-overlay": "2.0.0",
"@gitlab/fonts": "^1.2.0",
"@gitlab/svgs": "3.53.0",
- "@gitlab/ui": "64.10.1",
+ "@gitlab/ui": "64.13.0",
"@gitlab/visual-review-tools": "1.7.3",
"@gitlab/web-ide": "0.0.1-dev-20230614124516",
"@mattiasbuelens/web-streams-adapter": "^0.1.0",
diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb
index 9007e5723a9..aaf59bf32d6 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb
@@ -35,7 +35,11 @@ module QA
it(
'successfully imports project',
- testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/383351'
+ testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/383351',
+ quarantine: {
+ type: :investigating,
+ issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/415672"
+ }
) do
expect_project_import_finished_successfully
diff --git a/spec/frontend/releases/components/releases_pagination_spec.js b/spec/frontend/releases/components/releases_pagination_spec.js
index 923d84ae2b3..b241eb9acd4 100644
--- a/spec/frontend/releases/components/releases_pagination_spec.js
+++ b/spec/frontend/releases/components/releases_pagination_spec.js
@@ -60,9 +60,22 @@ describe('releases_pagination.vue', () => {
const findPrevButton = () => wrapper.findByTestId('prevButton');
const findNextButton = () => wrapper.findByTestId('nextButton');
+ describe('when there is only one page of results', () => {
+ beforeEach(() => {
+ createComponent(singlePageInfo);
+ });
+
+ it('hides the "Prev" button', () => {
+ expect(findPrevButton().exists()).toBe(false);
+ });
+
+ it('hides the "Next" button', () => {
+ expect(findNextButton().exists()).toBe(false);
+ });
+ });
+
describe.each`
description | pageInfo | prevEnabled | nextEnabled
- ${'when there is only one page of results'} | ${singlePageInfo} | ${false} | ${false}
${'when there is a next page, but not a previous page'} | ${onlyNextPageInfo} | ${false} | ${true}
${'when there is a previous page, but not a next page'} | ${onlyPrevPageInfo} | ${true} | ${false}
${'when there is both a previous and next page'} | ${prevAndNextPageInfo} | ${true} | ${true}
diff --git a/spec/helpers/clusters_helper_spec.rb b/spec/helpers/clusters_helper_spec.rb
index a18c82a80ed..a9fbdfbe3ca 100644
--- a/spec/helpers/clusters_helper_spec.rb
+++ b/spec/helpers/clusters_helper_spec.rb
@@ -224,21 +224,6 @@ RSpec.describe ClustersHelper do
subject
end
end
-
- context 'when remove_monitor_metrics FF is disabled' do
- before do
- stub_feature_flags(remove_monitor_metrics: false)
- end
-
- context 'integrations ' do
- let(:tab) { 'integrations' }
-
- it 'renders integrations tab' do
- expect(helper).to receive(:render).with('integrations')
- subject
- end
- end
- end
end
describe '#cluster_type_label' do
diff --git a/yarn.lock b/yarn.lock
index 83cb3e69579..dfeab1e5b42 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1127,10 +1127,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.53.0.tgz#6f952e59db6a3ebb59f034c240d7001a2dc8a92d"
integrity sha512-WgDZtl3ZmZgP0Fw62/YnNH/VjJbCp0bTU+qaBudic7T/ohu/Ex11RBcwakJyUZ5KWueFChGkulWKxVZz9baaDA==
-"@gitlab/ui@64.10.1":
- version "64.10.1"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-64.10.1.tgz#4696429f9a0f128537646d01b08eecea7e6c6529"
- integrity sha512-C1E6iAQ/7aLpGwXFmhyPs1ci6aTZe+bCN1xbGW8OJ2Ozet41tr4osI8cm1Pj4WLQL0IXqhQjg5z930HAlTR0Iw==
+"@gitlab/ui@64.13.0":
+ version "64.13.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-64.13.0.tgz#5330863f2155f4614cec394bfa6c7137a19d1d24"
+ integrity sha512-r7ZwANMdmeDZZbJRYUTxf8oJcyDjMzc0P4PkjjyYsyBzJLSBNEfqMRpEhV7QY35S9wdY8a4NbdeX6aLPRXqWjQ==
dependencies:
"@floating-ui/dom" "1.2.9"
bootstrap-vue "2.23.1"