From 9b984f55eef568b6a15c3a125e0cf66f35678e5a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 24 Jan 2020 09:08:32 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md | 2 +- doc/administration/geo/replication/version_specific_updates.md | 2 +- doc/administration/job_artifacts.md | 2 +- doc/administration/monitoring/prometheus/index.md | 2 +- doc/administration/packages/container_registry.md | 2 +- doc/api/audit_events.md | 2 +- doc/api/award_emoji.md | 2 +- doc/api/repositories.md | 2 +- doc/development/i18n/externalization.md | 2 +- doc/gitlab-basics/start-using-git.md | 2 +- doc/user/permissions.md | 3 ++- doc/user/project/integrations/prometheus.md | 2 +- doc/user/project/issues/design_management.md | 2 +- doc/user/project/members/share_project_with_groups.md | 2 +- doc/user/project/pipelines/settings.md | 2 +- doc/user/project/settings/index.md | 2 +- 16 files changed, 17 insertions(+), 16 deletions(-) (limited to 'doc') diff --git a/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md b/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md index dd0e4658ee9..a5a102d888b 100644 --- a/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md +++ b/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md @@ -105,7 +105,7 @@ The initial configuration of LDAP in GitLab requires changes to the `gitlab.rb` The two Active Directory specific values are `active_directory: true` and `uid: 'sAMAccountName'`. `sAMAccountName` is an attribute returned by Active Directory used for GitLab usernames. See the example output from `ldapsearch` for a full list of attributes a "person" object (user) has in **AD** - [`ldapsearch` example](#using-ldapsearch-unix) -> Both group_base and admin_group configuration options are only available in GitLab Enterprise Edition. See [GitLab EE - LDAP Features](../how_to_configure_ldap_gitlab_ee/index.html#gitlab-enterprise-edition---ldap-features) **(STARTER ONLY)** +> Both group_base and admin_group configuration options are only available in GitLab Enterprise Edition. See [GitLab EE - LDAP Features](../how_to_configure_ldap_gitlab_ee/index.md#gitlab-enterprise-edition---ldap-features) **(STARTER ONLY)** ### Example `gitlab.rb` LDAP diff --git a/doc/administration/geo/replication/version_specific_updates.md b/doc/administration/geo/replication/version_specific_updates.md index 7ce38d80c88..772defe0191 100644 --- a/doc/administration/geo/replication/version_specific_updates.md +++ b/doc/administration/geo/replication/version_specific_updates.md @@ -134,7 +134,7 @@ sudo gitlab-ctl reconfigure ``` If you do not perform this step, you may find that two-factor authentication -[is broken following DR](../disaster_recovery/index.html#i-followed-the-disaster-recovery-instructions-and-now-two-factor-auth-is-broken). +[is broken following DR](../disaster_recovery/index.md#i-followed-the-disaster-recovery-instructions-and-now-two-factor-auth-is-broken). To prevent SSH requests to the newly promoted **primary** node from failing due to SSH host key mismatch when updating the **primary** node domain's DNS record diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md index 99f4033e8fd..04974c6ea8b 100644 --- a/doc/administration/job_artifacts.md +++ b/doc/administration/job_artifacts.md @@ -369,7 +369,7 @@ If you need to manually remove job artifacts associated with multiple jobs while NOTE: **NOTE:** This step will also erase artifacts that users have chosen to - ["keep"](../user/project/pipelines/job_artifacts.html#browsing-artifacts). + ["keep"](../user/project/pipelines/job_artifacts.md#browsing-artifacts). ```ruby builds_to_clear = builds_with_artifacts.where("finished_at < ?", 1.week.ago) diff --git a/doc/administration/monitoring/prometheus/index.md b/doc/administration/monitoring/prometheus/index.md index 62bacf9791e..14f2d254a7c 100644 --- a/doc/administration/monitoring/prometheus/index.md +++ b/doc/administration/monitoring/prometheus/index.md @@ -133,7 +133,7 @@ To use an external Prometheus server: ``` 1. Install and set up a dedicated Prometheus instance, if necessary, using the [official installation instructions](https://prometheus.io/docs/prometheus/latest/installation/). -1. Add the Prometheus server IP address to the [monitoring IP whitelist](../ip_whitelist.html). For example: +1. Add the Prometheus server IP address to the [monitoring IP whitelist](../ip_whitelist.md). For example: ```ruby gitlab_rails['monitoring_whitelist'] = ['127.0.0.0/8', '192.168.0.1'] diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md index d3415913bab..3804319f60d 100644 --- a/doc/administration/packages/container_registry.md +++ b/doc/administration/packages/container_registry.md @@ -744,7 +744,7 @@ project or branch name. Special characters can include: To get around this, you can [change the group path](../../user/group/index.md#changing-a-groups-path), [change the project path](../../user/project/settings/index.md#renaming-a-repository) or change the -branch name. Another option is to create a [push rule](../../push_rules/push_rules.html) to prevent +branch name. Another option is to create a [push rule](../../push_rules/push_rules.md) to prevent this at the instance level. ### Image push errors diff --git a/doc/api/audit_events.md b/doc/api/audit_events.md index e451b975d42..a06a300e149 100644 --- a/doc/api/audit_events.md +++ b/doc/api/audit_events.md @@ -120,7 +120,7 @@ Example response: > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/34078) in GitLab 12.5. -The Group Audit Events API allows you to retrieve [group audit events](../administration/audit_events.html#group-events-starter). +The Group Audit Events API allows you to retrieve [group audit events](../administration/audit_events.md#group-events-starter). To retrieve group audit events using the API, you must [authenticate yourself](README.html#authentication) as an Administrator or an owner of the group. diff --git a/doc/api/award_emoji.md b/doc/api/award_emoji.md index 22ddab4bf79..41dbedf1ee2 100644 --- a/doc/api/award_emoji.md +++ b/doc/api/award_emoji.md @@ -10,7 +10,7 @@ Emoji can be awarded on the following (known as "awardables"): - [Merge requests](../user/project/merge_requests/index.md) ([API](merge_requests.md)). - [Snippets](../user/snippets.md) ([API](snippets.md)). -Emoji can also [be awarded](../user/award_emojis.html#award-emoji-for-comments) on comments (also known as notes). See also [Notes API](notes.md). +Emoji can also [be awarded](../user/award_emojis.md#award-emoji-for-comments) on comments (also known as notes). See also [Notes API](notes.md). ## Issues, merge requests, and snippets diff --git a/doc/api/repositories.md b/doc/api/repositories.md index 4bc28dd342f..faa30043423 100644 --- a/doc/api/repositories.md +++ b/doc/api/repositories.md @@ -128,7 +128,7 @@ curl --header "PRIVATE-TOKEN: " https://gitlab.com/api/v4/pro ## Compare branches, tags or commits This endpoint can be accessed without authentication if the repository is -publicly accessible. Note that diffs could have an empty diff string if [diff limits](../development/diffs.html#diff-limits) are reached. +publicly accessible. Note that diffs could have an empty diff string if [diff limits](../development/diffs.md#diff-limits) are reached. ``` GET /projects/:id/repository/compare diff --git a/doc/development/i18n/externalization.md b/doc/development/i18n/externalization.md index 488d7ae6762..86ac70ecef6 100644 --- a/doc/development/i18n/externalization.md +++ b/doc/development/i18n/externalization.md @@ -341,7 +341,7 @@ This also applies when using links in between translated sentences, otherwise th ```js {{ sprintf(s__("ClusterIntegration|Learn more about %{linkStart}zones%{linkEnd}"), { - linkStart: '' + linkStart: '', linkEnd: '', }) }} diff --git a/doc/gitlab-basics/start-using-git.md b/doc/gitlab-basics/start-using-git.md index 7fa84bf45bd..38376f4334f 100644 --- a/doc/gitlab-basics/start-using-git.md +++ b/doc/gitlab-basics/start-using-git.md @@ -93,7 +93,7 @@ This creates a `.git` directory that contains the Git configuration files. Once the directory has been initialized, you can [add a remote repository](#add-a-remote-repository) and [send changes to GitLab.com](#send-changes-to-gitlabcom). You will also need to -[create a new project in GitLab](../gitlab-basics/create-project.html#push-to-create-a-new-project) +[create a new project in GitLab](../gitlab-basics/create-project.md#push-to-create-a-new-project) for your Git repository. ### Clone a repository diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 9a32f0adfaa..599d65805fc 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -119,7 +119,7 @@ The following table depicts the various user permission levels in a project. | Configure project hooks | | | | ✓ | ✓ | | Manage Runners | | | | ✓ | ✓ | | Manage job triggers | | | | ✓ | ✓ | -| Manage variables | | | | ✓ | ✓ | +| Manage CI/CD variables | | | | ✓ | ✓ | | Manage GitLab Pages | | | | ✓ | ✓ | | Manage GitLab Pages domains and certificates | | | | ✓ | ✓ | | Remove GitLab Pages | | | | ✓ | ✓ | @@ -223,6 +223,7 @@ group. | Use security dashboard **(ULTIMATE)** | | | ✓ | ✓ | ✓ | | Create subgroup | | | | ✓ (1) | ✓ | | Edit group | | | | | ✓ | +| Manage group level CI/CD variables | | | | | ✓ | | Manage group members | | | | | ✓ | | Remove group | | | | | ✓ | | Delete group epic **(ULTIMATE)** | | | | | ✓ | diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index 6c6bb4034cf..d8938d81637 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -134,7 +134,7 @@ Multiple metrics can be displayed on the same chart if the fields **Name**, **Ty #### Query Variables -GitLab supports a limited set of [CI variables](../../../ci/variables/README.html) in the Prometheus query. This is particularly useful for identifying a specific environment, for example with `CI_ENVIRONMENT_SLUG`. The supported variables are: +GitLab supports a limited set of [CI variables](../../../ci/variables/README.md) in the Prometheus query. This is particularly useful for identifying a specific environment, for example with `CI_ENVIRONMENT_SLUG`. The supported variables are: - CI_ENVIRONMENT_SLUG - KUBE_NAMESPACE diff --git a/doc/user/project/issues/design_management.md b/doc/user/project/issues/design_management.md index fd4a01043ef..b8983a06180 100644 --- a/doc/user/project/issues/design_management.md +++ b/doc/user/project/issues/design_management.md @@ -34,7 +34,7 @@ to be enabled: and enable **Git Large File Storage**. Design Management requires that projects are using -[hashed storage](../../../administration/repository_storage_types.html#hashed-storage) +[hashed storage](../../../administration/repository_storage_types.md#hashed-storage) (the default storage type since v10.0). ### Feature Flags diff --git a/doc/user/project/members/share_project_with_groups.md b/doc/user/project/members/share_project_with_groups.md index 79fb2ea50a0..214937d4db2 100644 --- a/doc/user/project/members/share_project_with_groups.md +++ b/doc/user/project/members/share_project_with_groups.md @@ -54,4 +54,4 @@ It is possible to prevent projects in a group from [sharing a project with another group](../members/share_project_with_groups.md). This allows for tighter control over project access. -Learn more about [Share with group lock](../../group/index.html#share-with-group-lock). +Learn more about [Share with group lock](../../group/index.md#share-with-group-lock). diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md index ca888c69b37..3998dc69ad5 100644 --- a/doc/user/project/pipelines/settings.md +++ b/doc/user/project/pipelines/settings.md @@ -58,7 +58,7 @@ if the job surpasses the threshold, it is marked as failed. > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/17221) in GitLab 10.7. Project defined timeout (either specific timeout set by user or the default -60 minutes timeout) may be [overridden on Runner level](../../../ci/runners/README.html#setting-maximum-job-timeout-for-a-runner). +60 minutes timeout) may be [overridden on Runner level](../../../ci/runners/README.md#setting-maximum-job-timeout-for-a-runner). ## Maximum artifacts size **(CORE ONLY)** diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index 4e55f55dd28..bc1053f5bf2 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -86,7 +86,7 @@ related to the project by selecting the **Disable email notifications** checkbox Set up your project's merge request settings: -- Set up the merge request method (merge commit, [fast-forward merge](../merge_requests/fast_forward_merge.html)). +- Set up the merge request method (merge commit, [fast-forward merge](../merge_requests/fast_forward_merge.md)). - Add merge request [description templates](../description_templates.md#description-templates). - Enable [merge request approvals](../merge_requests/merge_request_approvals.md). **(STARTER)** - Enable [merge only if pipeline succeeds](../merge_requests/merge_when_pipeline_succeeds.md). -- cgit v1.2.3