Commit 9db16080 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs-misc-ee' into 'master'

Docs: (EE-Port) Misc small fixes to docs

See merge request gitlab-org/gitlab-ee!9451
parents 2d79fbc7 1e9ea50d
......@@ -15,4 +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/#security-of-running-jobs)
- [Security of running jobs](https://docs.gitlab.com/runner/security/)
......@@ -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).
......
# Time Tracking
> Introduced in GitLab 8.14 in beta.
> Introduced in GitLab 8.14.
Time Tracking allows you to track estimates and time spent on issues and merge
requests within GitLab.
......@@ -45,7 +45,7 @@ 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_estimate `.
To remove an estimation entirely, use `/remove_estimate`.
### Time spent
......@@ -75,7 +75,6 @@ Default conversion rates are 1mo = 4w, 1w = 5d and 1d = 8h.
Other interesting links:
- [Time Tracking landing page on about.gitlab.com][landing]
- [Time Tracking landing page on about.gitlab.com](https://about.gitlab.com/features/time-tracking)
[landing]: https://about.gitlab.com/features/time-tracking
[quick actions]: ../user/project/quick_actions.md
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment