summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-03 18:08:55 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-03 18:08:55 +0000
commit8f9307985ea047abb5b8a7c6c56bb644e0b7c363 (patch)
tree474c91c280b903c345bd94f4842abf481c535656 /doc/user
parent3cda3d43aef1e92e2eedf7383122c6db9c61149f (diff)
downloadgitlab-ce-8f9307985ea047abb5b8a7c6c56bb644e0b7c363.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/admin_area/settings/account_and_limit_settings.md3
-rw-r--r--doc/user/clusters/agent/work_with_agent.md1
-rw-r--r--doc/user/okrs.md4
-rw-r--r--doc/user/packages/debian_repository/index.md65
-rw-r--r--doc/user/profile/index.md3
-rw-r--r--doc/user/project/quick_actions.md2
-rw-r--r--doc/user/usage_quotas.md6
7 files changed, 66 insertions, 18 deletions
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 7f678344955..35a4c0aeea7 100644
--- a/doc/user/admin_area/settings/account_and_limit_settings.md
+++ b/doc/user/admin_area/settings/account_and_limit_settings.md
@@ -86,6 +86,9 @@ To modify the maximum file size for imports in GitLab:
1. On the left sidebar, select **Settings > General**, then expand **Account and limit**.
1. Increase or decrease by changing the value in **Maximum import size (MB)**.
+This setting applies only to repositories
+[imported from a GitLab export file](../../project/settings/import_export.md#import-a-project-and-its-data).
+
If you choose a size larger than the configured value for the web server,
you may receive errors. See the [troubleshooting section](#troubleshooting) for more
details.
diff --git a/doc/user/clusters/agent/work_with_agent.md b/doc/user/clusters/agent/work_with_agent.md
index 28a0d366ec5..0b0e1365604 100644
--- a/doc/user/clusters/agent/work_with_agent.md
+++ b/doc/user/clusters/agent/work_with_agent.md
@@ -19,6 +19,7 @@ Prerequisite:
To view the list of agents:
1. On the top bar, select **Main menu > Projects** and find the project that contains your agent configuration file.
+ You cannot view registered agents from a project that does not contain the agent configuration file.
1. On the left sidebar, select **Infrastructure > Kubernetes clusters**.
1. Select **Agent** tab to view clusters connected to GitLab through the agent.
diff --git a/doc/user/okrs.md b/doc/user/okrs.md
index a4ba1f8f646..0d3be8474fe 100644
--- a/doc/user/okrs.md
+++ b/doc/user/okrs.md
@@ -13,8 +13,8 @@ OKRs are in [**Alpha**](../policy/alpha-beta-support.md#alpha-features).
For the OKR feature roadmap, see [epic 7864](https://gitlab.com/groups/gitlab-org/-/epics/7864).
FLAG:
-On self-managed GitLab, by default this feature is not available. To make it available,
-ask an administrator to [enable the featured flag](../administration/feature_flags.md) named `okrs_mvc`.
+On self-managed GitLab, by default this feature is not available. To make it available per project, ask an administrator to [enable the featured flag](../administration/feature_flags.md) named `okrs_mvc`.
+On GitLab.com, this feature is not available.
The feature is not ready for production use.
Use objectives and key results to align your workforce towards common goals and track the progress.
diff --git a/doc/user/packages/debian_repository/index.md b/doc/user/packages/debian_repository/index.md
index 08b069c3f69..7ec20e3d036 100644
--- a/doc/user/packages/debian_repository/index.md
+++ b/doc/user/packages/debian_repository/index.md
@@ -62,24 +62,44 @@ Feature.disable(:debian_group_packages)
Creating a Debian package is documented [on the Debian Wiki](https://wiki.debian.org/Packaging).
-## Authenticate to the Package Registry
+## Authenticate to the Debian endpoints
-To create a distribution, publish a package, or install a private package, you need one of the
-following:
+Authentication methods differs between [distributions APIs](#authenticate-to-the-debian-distributions-apis)
+and [package repositories](#authenticate-to-the-debian-package-repositories).
-- [Personal access token](../../../api/rest/index.md#personalprojectgroup-access-tokens)
+### Authenticate to the Debian distributions APIs
+
+To create, read, update, or delete a distribution, you need one of the following:
+
+- [Personal access token](../../../api/rest/index.md#personalprojectgroup-access-tokens),
+ using `--header "PRIVATE-TOKEN: <personal_access_token>"`
+- [Deploy token](../../project/deploy_tokens/index.md)
+ using `--header "Deploy-Token: <deploy_token>"`
- [CI/CD job token](../../../ci/jobs/ci_job_token.md)
+ using `--header "Job-Token: <job_token>"`
+
+### Authenticate to the Debian Package Repositories
+
+To publish a package, or install a private package, you need to use basic authentication,
+with one of the following:
+
+- [Personal access token](../../../api/rest/index.md#personalprojectgroup-access-tokens),
+ using `<username>:<personal_access_token>`
- [Deploy token](../../project/deploy_tokens/index.md)
+ using `<deploy_token_name>:<deploy_token>`
+- [CI/CD job token](../../../ci/jobs/ci_job_token.md)
+ using `gitlab-ci-token:<job_token>`
## Create a Distribution
On the project-level, Debian packages are published using *Debian Distributions*. To publish
packages on the group level, create a distribution with the same `codename`.
-To create a project-level distribution:
+To create a project-level distribution using a personal access token:
```shell
-curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/<project_id>/debian_distributions?codename=<codename>"
+curl --request POST --header "PRIVATE-TOKEN: <personal_access_token>" \
+ "https://gitlab.example.com/api/v4/projects/<project_id>/debian_distributions?codename=<codename>"
```
Example response with `codename=sid`:
@@ -120,33 +140,50 @@ Once built, several files are created:
- `.buildinfo` file: Used for Reproducible builds (optional)
- `.changes` file: Upload metadata, and list of uploaded files (all the above)
-To upload these files, you can use `dput-ng >= 1.32` (Debian bullseye):
+To upload these files, you can use `dput-ng >= 1.32` (Debian bullseye).
+`<username>` and `<password>` are defined
+[as above](#authenticate-to-the-debian-package-repositories):
```shell
cat <<EOF > dput.cf
[gitlab]
method = https
-fqdn = <username>:<your_access_token>@gitlab.example.com
+fqdn = <username>:<password>@gitlab.example.com
incoming = /api/v4/projects/<project_id>/packages/debian
EOF
dput --config=dput.cf --unchecked --no-upload-log gitlab <your_package>.changes
```
+## Directly upload a package
+
+> Direct upload [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/101838) in GitLab 15.9.
+
+When you don't have access to `.changes` file, you can directly upload a `.deb` by passing
+distribution `codename` and target `component` as parameters with
+your [credentials](#authenticate-to-the-debian-package-repositories).
+For example, to upload to component `main` of distribution `sid` using a personal access token:
+
+```shell
+curl --request PUT --user "<username>:<personal_access_token>" \
+ "https://gitlab.example.com/api/v4/projects/<project_id>/packages/debian/?distribution=sid&component=main" \
+ --upload-file /path/to/your.deb
+```
+
## Install a package
To install a package:
1. Configure the repository:
- If you are using a private project, add your [credentials](#authenticate-to-the-package-registry) to your apt configuration:
+ If you are using a private project, add your [credentials](#authenticate-to-the-debian-package-repositories) to your apt configuration:
```shell
- echo 'machine gitlab.example.com login <username> password <your_access_token>' \
+ echo 'machine gitlab.example.com login <username> password <password>' \
| sudo tee /etc/apt/auth.conf.d/gitlab_project.conf
```
- Download your distribution key:
+ Download your distribution key using your [credentials](#authenticate-to-the-debian-distributions-apis):
```shell
sudo mkdir -p /usr/local/share/keyrings
@@ -179,14 +216,14 @@ To download a source package:
1. Configure the repository:
- If you are using a private project, add your [credentials](#authenticate-to-the-package-registry) to your apt configuration:
+ If you are using a private project, add your [credentials](#authenticate-to-the-debian-package-repositories) to your apt configuration:
```shell
- echo 'machine gitlab.example.com login <username> password <your_access_token>' \
+ echo 'machine gitlab.example.com login <username> password <password>' \
| sudo tee /etc/apt/auth.conf.d/gitlab_project.conf
```
- Download your distribution key:
+ Download your distribution key using your [credentials](#authenticate-to-the-debian-distributions-apis):
```shell
sudo mkdir -p /usr/local/share/keyrings
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index 65951ce2dda..a84d16e6d0c 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -132,8 +132,9 @@ To add links to other accounts:
1. On the top bar, in the upper-right corner, select your avatar.
1. Select **Edit profile**.
1. In the **Main settings** section, add your information from:
- - Skype
+ - Discord ([User ID](https://support.discord.com/hc/en-us/articles/206346498-Where-can-I-find-my-User-Server-Message-ID-))
- LinkedIn
+ - Skype
- Twitter
1. Select **Update profile settings**.
diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md
index d12a71c9ab3..194b501d1fb 100644
--- a/doc/user/project/quick_actions.md
+++ b/doc/user/project/quick_actions.md
@@ -71,7 +71,7 @@ threads. Some quick actions might not be available to all subscription tiers.
| `/create_merge_request <branch name>` | **{check-circle}** Yes | **{dotted-circle}** No | **{dotted-circle}** No | Create a new merge request starting from the current issue. |
| `/done` | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | Mark to do as done. |
| `/draft` | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Set the [draft status](merge_requests/drafts.md). Use for toggling the draft status ([deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92654) in GitLab 15.4.) |
-| `/due <date>` | **{check-circle}** Yes | **{dotted-circle}** No | **{dotted-circle}** No | Set due date. Examples of valid `<date>` include `in 2 days`, `this Friday` and `December 31st`. |
+| `/due <date>` | **{check-circle}** Yes | **{dotted-circle}** No | **{dotted-circle}** No | Set due date. Examples of valid `<date>` include `in 2 days`, `this Friday` and `December 31st`. See [Chronic](https://gitlab.com/gitlab-org/ruby/gems/gitlab-chronic#examples) for more examples. |
| `/duplicate <#issue>` | **{check-circle}** Yes | **{dotted-circle}** No | **{dotted-circle}** No | Close this issue. Mark as a duplicate of, and related to, issue `<#issue>`. |
| `/epic <epic>` | **{check-circle}** Yes | **{dotted-circle}** No | **{dotted-circle}** No | Add to epic `<epic>`. The `<epic>` value should be in the format of `&epic`, `group&epic`, or a URL to an epic. |
| `/estimate <time>` or `/estimate_time <time>` | **{check-circle}** Yes | **{check-circle}** Yes | **{dotted-circle}** No | Set time estimate. For example, `/estimate 1mo 2w 3d 4h 5m`. Learn more about [time tracking](time_tracking.md). Alias `/estimate_time` [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/16501) in GitLab 15.6. |
diff --git a/doc/user/usage_quotas.md b/doc/user/usage_quotas.md
index 18eac74cd96..89761a4819a 100644
--- a/doc/user/usage_quotas.md
+++ b/doc/user/usage_quotas.md
@@ -137,6 +137,12 @@ Storage types that add to the total namespace storage are:
If your total namespace storage exceeds the available namespace storage quota, all projects under the namespace become read-only. Your ability to write new data is restricted until the read-only state is removed. For more information, see [Restricted actions](../user/read_only_namespaces.md#restricted-actions).
+To notify you that you have nearly exceeded your namespace storage quota:
+
+- In the command line interface, a notification displays after each `git push` action when you've reached 95% and 100% of your namespace storage quota.
+- In the GitLab UI, a notification displays when you've reached 75%, 95%, and 100% of your namespace storage quota.
+- GitLab sends an email to members with the Owner role to notify them when namespace storage usage is at 70%, 85%, 95%, and 100%.
+
To prevent exceeding the namespace storage quota, you can:
- Reduce storage consumption by following the suggestions in the [Manage Your Storage Usage](#manage-your-storage-usage) section of this page.