Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-20

# Conflicts:
#	app/serializers/project_mirror_entity.rb
#	app/views/projects/settings/repository/show.html.haml
#	locale/gitlab.pot

[ci skip]

app/serializers/project_mirror_entity.rb

@@ -3,8 +3,11 @@
 class ProjectMirrorEntity < Grape::Entity
   prepend ::EE::ProjectMirrorEntity
 
+<<<<<<< HEAD
   expose :id
 
+=======
+>>>>>>> upstream/master
   expose :remote_mirrors_attributes, using: RemoteMirrorEntity do |project|
     project.remote_mirrors
   end

app/views/projects/settings/repository/show.html.haml

@@ -3,7 +3,10 @@
 - @content_class = "limit-container-width" unless fluid_layout
 
 = render "projects/default_branch/show"
+<<<<<<< HEAD
 = render "projects/push_rules/index"
+=======
+>>>>>>> upstream/master
 = render "projects/mirrors/mirror_repos"
 
 -# Protected branches & tags use a lot of nested partials.

doc/README.md

@@ -202,7 +202,7 @@ instant how code changes impact your production environment.
 
 - [GitLab Prometheus](administration/monitoring/prometheus/index.md): Configure the bundled Prometheus to collect various metrics from your GitLab instance.
 - [Prometheus project integration](user/project/integrations/prometheus.md): Configure the Prometheus integration per project and monitor your CI/CD environments.
-- [Prometheus metrics](user/project/integrations/prometheus_library/metrics.md): Let Prometheus collect metrics from various services, like Kubernetes, NGINX, NGINX ingress controller, HAProxy, and Amazon Cloud Watch.
+- [Prometheus metrics](user/project/integrations/prometheus_library/index.md): Let Prometheus collect metrics from various services, like Kubernetes, NGINX, NGINX ingress controller, HAProxy, and Amazon Cloud Watch.
 - [GitLab Performance Monitoring](administration/monitoring/performance/index.md): Use InfluxDB and Grafana to monitor the performance of your GitLab instance (will be eventually replaced by Prometheus).
 - [Health check](user/admin_area/monitoring/health_check.md): GitLab provides liveness and readiness probes to indicate service health and reachability to required services.
 - [GitLab Cycle Analytics](user/project/cycle_analytics.md): Cycle Analytics measures the time it takes to go from an

doc/administration/gitaly/index.md

 # Gitaly
 
-[Gitaly](https://gitlab.com/gitlab-org/gitaly) (introduced in GitLab
-9.0) is a service that provides high-level RPC access to Git
-repositories. Gitaly was optional when it was first introduced in
-GitLab, but since GitLab 9.4 it is a mandatory component of the
-application.
+[Gitaly](https://gitlab.com/gitlab-org/gitaly) is the service that 
+provides high-level RPC access to Git repositories. Without it, no other
+components can read or write Git data.
 
 GitLab components that access Git repositories (gitlab-rails,
 gitlab-shell, gitlab-workhorse) act as clients to Gitaly. End users do
@@ -47,15 +45,9 @@ installations that are larger than a single machine. Most
 installations will be better served with the default configuration
 used by Omnibus and the GitLab source installation guide.
 
-Starting with GitLab 9.4 it is possible to run Gitaly on a different
-server from the rest of the application. This can improve performance
-when running GitLab with its repositories stored on an NFS server.
-
-At the moment (GitLab 9.4) Gitaly is not yet a replacement for NFS
-because some parts of GitLab still bypass Gitaly when accessing Git
-repositories. If you choose to deploy Gitaly on your NFS server you
-must still also mount your Git shares on your GitLab application
-servers.
+Starting with GitLab 11.4, Gitaly is a replacement for NFS except
+when the [Elastic Search indexer](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer)
+is used.
 
 Gitaly network traffic is unencrypted so you should use a firewall to
 restrict access to your Gitaly server.

doc/ci/environments.md

@@ -586,13 +586,13 @@ exist, you should see something like:
 >
 > - For the monitoring dashboard to appear, you need to:
 >   - Have enabled the [Prometheus integration][prom]
->   - Configured Prometheus to collect at least one [supported metric](../user/project/integrations/prometheus_library/metrics.md)
+>   - Configured Prometheus to collect at least one [supported metric](../user/project/integrations/prometheus_library/index.md)
 > - With GitLab 9.2, all deployments to an environment are shown directly on the
 >  monitoring dashboard
 
 If you have enabled [Prometheus for monitoring system and response metrics](https://docs.gitlab.com/ee/user/project/integrations/prometheus.html), you can monitor the performance behavior of your app running in each environment.
 
-Once configured, GitLab will attempt to retrieve [supported performance metrics](https://docs.gitlab.com/ee/user/project/integrations/prometheus_library/metrics.html) for any
+Once configured, GitLab will attempt to retrieve [supported performance metrics](https://docs.gitlab.com/ee/user/project/integrations/prometheus_library/index.html) for any
 environment which has had a successful deployment. If monitoring data was
 successfully retrieved, a Monitoring button will appear for each environment.
 

doc/user/project/integrations/prometheus.md

@@ -56,7 +56,7 @@ The [NGINX Ingress](../clusters/index.md#installing-applications) that is deploy
 Integration with Prometheus requires the following:
 
 1. GitLab 9.0 or higher
-1. Prometheus must be configured to collect one of the [supported metrics](prometheus_library/metrics.md)
+1. Prometheus must be configured to collect one of the [supported metrics](prometheus_library/index.md)
 1. Each metric must be have a label to indicate the environment
 1. GitLab must have network connectivity to the Prometheus server
 
@@ -65,7 +65,7 @@ Integration with Prometheus requires the following:
 Installing and configuring Prometheus to monitor applications is fairly straight forward.
 
 1. [Install Prometheus](https://prometheus.io/docs/introduction/install/)
-1. Set up one of the [supported monitoring targets](prometheus_library/metrics.md)
+1. Set up one of the [supported monitoring targets](prometheus_library/index.md)
 1. Configure the Prometheus server to [collect their metrics](https://prometheus.io/docs/operating/configuration/#scrape_config)
 
 #### Configuration in GitLab

doc/user/project/integrations/prometheus_library/cloudwatch.md

@@ -27,4 +27,4 @@ A sample Cloudwatch Exporter configuration file, configured for basic AWS ELB mo
 ## Specifying the Environment label
 
 In order to isolate and only display relevant metrics for a given environment
-however, GitLab needs a method to detect which labels are associated. To do this, GitLab will [look for an `environment` label](metrics.md#identifying-environments).
+however, GitLab needs a method to detect which labels are associated. To do this, GitLab will [look for an `environment` label](index.md#identifying-environments).

doc/user/project/integrations/prometheus_library/haproxy.md

@@ -21,4 +21,4 @@ To get started with NGINX monitoring, you should install and configure the [HAPr
 ## Specifying the Environment label
 
 In order to isolate and only display relevant metrics for a given environment
-however, GitLab needs a method to detect which labels are associated. To do this, GitLab will [look for an `environment` label](metrics.md#identifying-environments).
+however, GitLab needs a method to detect which labels are associated. To do this, GitLab will [look for an `environment` label](index.md#identifying-environments).

doc/user/project/integrations/prometheus_library/index.md

+# Prometheus Metrics library
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8935) in GitLab 9.0.
+
+GitLab offers automatic detection of select [Prometheus exporters](https://prometheus.io/docs/instrumenting/exporters/).
+
+## Exporters
+
+Currently supported exporters are:
+
+- [Kubernetes](kubernetes.md)
+- [NGINX](nginx.md)
+- [NGINX Ingress Controller](nginx_ingress.md)
+- [HAProxy](haproxy.md)
+- [Amazon Cloud Watch](cloudwatch.md)
+
+We have tried to surface the most important metrics for each exporter, and will
+be continuing to add support for additional exporters in future releases. If you
+would like to add support for other official exporters, contributions are welcome.
+
+## Identifying Environments
+
+GitLab retrieves performance data from the configured Prometheus server, and
+attempts to identifying the presence of known metrics. Once identified, GitLab
+then needs to be able to map the data to a particular environment.
+
+In order to isolate and only display relevant metrics for a given environment,
+GitLab needs a method to detect which labels are associated. To do that,
+GitLab uses the defined queries and fills in the environment specific variables.
+Typically this involves looking for the
+[`$CI_ENVIRONMENT_SLUG`](../../../../ci/variables/README.md#predefined-variables-environment-variables),
+but may also include other information such as the project's Kubernetes namespace.
+Each search query is defined in the [exporter specific documentation](#exporters).

doc/user/project/integrations/prometheus_library/metrics.md

-# Prometheus Metrics library
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8935) in GitLab 9.0
-
-GitLab offers automatic detection of select [Prometheus exporters](https://prometheus.io/docs/instrumenting/exporters/). Currently supported exporters are:
-* [Kubernetes](kubernetes.md)
-* [NGINX](nginx.md)
-* [NGINX Ingress Controller](nginx_ingress.md)
-* [HAProxy](haproxy.md)
-* [Amazon Cloud Watch](cloudwatch.md)
-
-We have tried to surface the most important metrics for each exporter, and will be continuing to add support for additional exporters in future releases. If you would like to add support for other official exporters, [contributions](#adding-to-the-library) are welcome.
-
-## Identifying Environments
-
-GitLab retrieves performance data from the configured Prometheus server, and attempts to identifying the presence of known metrics. Once identified, GitLab then needs to be able to map the data to a particular environment.
-
-In order to isolate and only display relevant metrics for a given environment, GitLab needs a method to detect which labels are associated. To do that,
-GitLab uses the defined queries and fills in the environment specific variables. Typically this involves looking for the [$CI_ENVIRONMENT_SLUG](../../../../ci/variables/README.md#predefined-variables-environment-variables), but may also include other information such as the project's Kubernetes namespace. Each search query is defined in the [exporter specific documentation](#prometheus-metrics-library).
+This document was moved to [another location](index.md).

doc/user/project/integrations/prometheus_library/nginx.md

@@ -27,4 +27,4 @@ If you are using NGINX as your Kubernetes ingress, GitLab will [automatically de
 ## Specifying the Environment label
 
 In order to isolate and only display relevant metrics for a given environment
-however, GitLab needs a method to detect which labels are associated. To do this, GitLab will [look for an `environment` label](metrics.md#identifying-environments).
+however, GitLab needs a method to detect which labels are associated. To do this, GitLab will [look for an `environment` label](index.md#identifying-environments).

locale/gitlab.pot

@@ -641,6 +641,7 @@ msgstr ""
 msgid "An error occurred when toggling the notification subscription"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "An error occurred when updating the issue weight"
 msgstr ""
 
@@ -650,6 +651,8 @@ msgstr ""
 msgid "An error occurred while deleting the comment"
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "An error occurred while detecting host keys"
 msgstr ""
 
@@ -3517,9 +3520,12 @@ msgstr ""
 msgid "Fingerprints"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Finish review"
 msgstr ""
 
+=======
+>>>>>>> upstream/master
 msgid "Finished"
 msgstr ""
 
@@ -4276,6 +4282,12 @@ msgstr ""
 msgid "Hide host keys manual input"
 msgstr ""
 
+msgid "Here is the public SSH key that needs to be added to the remote server. For more information, please refer to the documentation."
+msgstr ""
+
+msgid "Hide host keys manual input"
+msgstr ""
+
 msgid "Hide payload"
 msgstr ""