diff options
| -rw-r--r-- | doc/security/README.md | 1 | ||||
| -rw-r--r-- | doc/topics/authentication/index.md | 2 | ||||
| -rw-r--r-- | doc/topics/autodevops/index.md | 12 | ||||
| -rw-r--r-- | doc/user/project/integrations/prometheus.md | 2 | ||||
| -rw-r--r-- | doc/user/project/milestones/index.md | 5 | ||||
| -rw-r--r-- | doc/user/project/web_ide/index.md | 12 | ||||
| -rw-r--r-- | doc/workflow/time_tracking.md | 10 |
7 files changed, 25 insertions, 19 deletions
diff --git a/doc/security/README.md b/doc/security/README.md index e22dc00759d..a90127e0356 100644 --- a/doc/security/README.md +++ b/doc/security/README.md @@ -15,3 +15,4 @@ comments: false - [How we manage the CRIME vulnerability](crime_vulnerability.md) - [Enforce Two-factor authentication](two_factor_authentication.md) - [Send email confirmation on sign-up](user_email_confirmation.md) +- [Security of running jobs](https://docs.gitlab.com/runner/security/) diff --git a/doc/topics/authentication/index.md b/doc/topics/authentication/index.md index a354d3e7884..df6897002c9 100644 --- a/doc/topics/authentication/index.md +++ b/doc/topics/authentication/index.md @@ -21,7 +21,7 @@ This page gathers all the resources for the topic **Authentication** within GitL - [Enforce Two-factor Authentication (2FA)](../../security/two_factor_authentication.md#enforce-two-factor-authentication-2fa) - **Articles:** - [How to Configure LDAP with GitLab CE](../../administration/auth/how_to_configure_ldap_gitlab_ce/index.md) - - [How to Configure LDAP with GitLab EE](https://docs.gitlab.com/ee/articles/how_to_configure_ldap_gitlab_ee/) + - [How to Configure LDAP with GitLab EE](https://docs.gitlab.com/ee/administration/auth/how_to_configure_ldap_gitlab_ee/index.md) - [Feature Highlight: LDAP Integration](https://about.gitlab.com/2014/07/10/feature-highlight-ldap-sync/) - [Debugging LDAP](https://about.gitlab.com/handbook/support/workflows/support-engineering/ldap/debugging_ldap.html) - **Integrations:** diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 91be3e3d45d..b72138ef24f 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -58,15 +58,15 @@ project in a simple and automatic way: 1. [Auto Build](#auto-build) 1. [Auto Test](#auto-test) -1. [Auto Code Quality](#auto-code-quality) **[STARTER]** -1. [Auto SAST (Static Application Security Testing)](#auto-sast) **[ULTIMATE]** -1. [Auto Dependency Scanning](#auto-dependency-scanning) **[ULTIMATE]** -1. [Auto License Management](#auto-license-management) **[ULTIMATE]** +1. [Auto Code Quality](#auto-code-quality-starter) **[STARTER]** +1. [Auto SAST (Static Application Security Testing)](#auto-sast-ultimate) **[ULTIMATE]** +1. [Auto Dependency Scanning](#auto-dependency-scanning-ultimate) **[ULTIMATE]** +1. [Auto License Management](#auto-license-management-ultimate) **[ULTIMATE]** 1. [Auto Container Scanning](#auto-container-scanning) 1. [Auto Review Apps](#auto-review-apps) -1. [Auto DAST (Dynamic Application Security Testing)](#auto-dast) **[ULTIMATE]** +1. [Auto DAST (Dynamic Application Security Testing)](#auto-dast-ultimate) **[ULTIMATE]** 1. [Auto Deploy](#auto-deploy) -1. [Auto Browser Performance Testing](#auto-browser-performance-testing) **[PREMIUM]** +1. [Auto Browser Performance Testing](#auto-browser-performance-testing-premium) **[PREMIUM]** 1. [Auto Monitoring](#auto-monitoring) As Auto DevOps relies on many different components, it's good to have a basic diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index a4698fd172a..ed289b0c4eb 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -89,7 +89,7 @@ to integrate with. Once configured, GitLab will attempt to retrieve performance metrics for any environment which has had a successful deployment. -GitLab will automatically scan the Prometheus server for metrics from known serves like Kubernetes and NGINX, and attempt to identify individual environment. The supported metrics and scan process is detailed in our [Prometheus Metrics Library documentation](prometheus_library/index.md). +GitLab will automatically scan the Prometheus server for metrics from known servers like Kubernetes and NGINX, and attempt to identify individual environment. The supported metrics and scan process is detailed in our [Prometheus Metrics Library documentation](prometheus_library/index.md). You can view the performance dashboard for an environment by [clicking on the monitoring button](../../../ci/environments.md#monitoring-environments). diff --git a/doc/user/project/milestones/index.md b/doc/user/project/milestones/index.md index ac58a0b5c18..e6033ca8655 100644 --- a/doc/user/project/milestones/index.md +++ b/doc/user/project/milestones/index.md @@ -28,8 +28,9 @@ the milestone to the issue. ## Project milestones and group milestones -- **Project milestones** can be assigned to issues or merge requests in that project only. -- **Group milestones** can be assigned to any issue or merge request of any project in that group. +- **Project milestones** can be assigned to issues or merge requests in that project only. Navigate to **Issues > Milestones** in a project to view the project milestone list. +- **Group milestones** can be assigned to any issue or merge request of any project in that group. Navigate to **Issues > Milestones** in a group to view the group milestone list. +- All milestones you have access to can also be viewed in the dashboard milestones list. Click on **Milestones** on the top navigation bar to view both project milestones and group milestones you have access to. ## Creating milestones diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md index 55e53b865af..9c095da5a4b 100644 --- a/doc/user/project/web_ide/index.md +++ b/doc/user/project/web_ide/index.md @@ -3,8 +3,8 @@ > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/4539) in [GitLab Ultimate][ee] 10.4. > [Brought to GitLab Core](https://gitlab.com/gitlab-org/gitlab-ce/issues/44157) in 10.7. -The Web IDE makes it faster and easier to contribute changes to your projects -by providing an advanced editor with commit staging. +The Web IDE editor makes it faster and easier to contribute changes to your +projects by providing an advanced editor with commit staging. ## Open the Web IDE @@ -22,7 +22,7 @@ searching. The file finder is launched using the keyboard shortcut `Command-p`, `Control-p`, or `t` (when editor is not in focus). Type the filename or file path fragments to start seeing results. -## Syntax highligting +## Syntax highlighting As expected from an IDE, syntax highlighting for many languages within the Web IDE will make your direct editing even easier. @@ -47,7 +47,7 @@ Single file editing is based on the [Ace Editor](https://ace.c9.io). After making your changes, click the Commit button in the bottom left to review the list of changed files. Click on each file to review the changes and -click the tick icon to stage the file. +click the tick icon to stage the file. Once you have staged some changes, you can add a commit message and commit the staged changes. Unstaged changes will not be commited. @@ -80,7 +80,7 @@ left. > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19318) in [GitLab Core][ce] 11.0. Switching between your authored and assigned merge requests can be done without -leaving the Web IDE. Click the dropdown in the top of the sidebar to open a list +leaving the Web IDE. Click the dropdown in the top of the sidebar to open a list of merge requests. You will need to commit or discard all your changes before switching to a different merge request. @@ -89,7 +89,7 @@ switching to a different merge request. > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20850) in [GitLab Core][ce] 11.2. Switching between branches of the current project repository can be done without -leaving the Web IDE. Click the dropdown in the top of the sidebar to open a list +leaving the Web IDE. Click the dropdown in the top of the sidebar to open a list of branches. You will need to commit or discard all your changes before switching to a different branch. diff --git a/doc/workflow/time_tracking.md b/doc/workflow/time_tracking.md index 2bb140b99d0..ad43189148c 100644 --- a/doc/workflow/time_tracking.md +++ b/doc/workflow/time_tracking.md @@ -38,13 +38,14 @@ Adding time entries (time spent or estimates) is limited to project members. To enter an estimate, write `/estimate`, followed by the time. For example, if you need to enter an estimate of 3 days, 5 hours and 10 minutes, you would write -`/estimate 3d 5h 10m`. +`/estimate 3d 5h 10m`. Time units that we support are listed at the bottom of +this help page. Every time you enter a new time estimate, any previous time estimates will be overridden by this new value. There should only be one valid estimate in an issue or a merge request. -To remove an estimation entirely, use `/remove_estimation`. +To remove an estimation entirely, use `/remove_estimate`. ### Time spent @@ -72,5 +73,8 @@ The following time units are available: Default conversion rates are 1mo = 4w, 1w = 5d and 1d = 8h. -[landing]: https://about.gitlab.com/features/time-tracking +Other interesting links: + +- [Time Tracking landing page on about.gitlab.com](https://about.gitlab.com/features/time-tracking) + [quick actions]: ../user/project/quick_actions.md |