Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-21

# Conflicts:
#	app/assets/javascripts/pages/search/init_filtered_search.js
#	app/views/projects/issues/index.html.haml
#	app/views/projects/merge_requests/show.html.haml
#	config/webpack.config.js
#	doc/user/project/integrations/prometheus_library/kubernetes.md

[ci skip]

app/assets/javascripts/pages/search/init_filtered_search.js

@@ -9,7 +9,11 @@ import '~/filtered_search/filtered_search_manager';
 import '~/filtered_search/filtered_search_tokenizer';
 import '~/filtered_search/filtered_search_visual_tokens';
 
+<<<<<<< HEAD
 export default ({ page, filteredSearchTokenKeys, stateFiltersSelector }) => {
+=======
+export default ({ page }) => {
+>>>>>>> upstream/master
   const filteredSearchEnabled = gl.FilteredSearchManager && document.querySelector('.filtered-search');
   if (filteredSearchEnabled) {
     const filteredSearchManager = new gl.FilteredSearchManager({

app/views/projects/issues/index.html.haml

@@ -6,7 +6,10 @@
 
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag 'common_vue'
+<<<<<<< HEAD
   = webpack_bundle_tag 'issues'
+=======
+>>>>>>> upstream/master
 
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, params.merge(rss_url_options), title: "#{@project.name} issues")

app/views/projects/merge_requests/show.html.haml

@@ -6,7 +6,10 @@
 - page_card_attributes @merge_request.card_attributes
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag('common_vue')
+<<<<<<< HEAD
   = webpack_bundle_tag('issuable')
+=======
+>>>>>>> upstream/master
 
 .merge-request{ data: { mr_action: j(params[:tab].presence || 'show'), url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project) } }
   = render "projects/merge_requests/mr_title"

config/webpack.config.js

@@ -68,10 +68,14 @@ var config = {
     filtered_search:      './filtered_search/filtered_search_bundle.js',
     geo_nodes:            'ee/geo_nodes',
     help:                 './help/help.js',
+<<<<<<< HEAD
     issuable:             './issuable/issuable_bundle.js',
     issues:               './issues/issues_bundle.js',
     issue_show:           './issue_show/index.js',
     ldap_group_links:     './groups/ldap_group_links.js',
+=======
+    issue_show:           './issue_show/index.js',
+>>>>>>> upstream/master
     locale:               './locale/index.js',
     main:                 './main.js',
     merge_conflicts:      './merge_conflicts/merge_conflicts_bundle.js',

doc/install/requirements.md

@@ -194,3 +194,6 @@ use the CI features.
 We support the current and the previous major release of Firefox, Chrome/Chromium, Safari and Microsoft browsers (Microsoft Edge and Internet Explorer 11).
 
 Each time a new browser version is released, we begin supporting that version and stop supporting the third most recent version.
+
+Note: We do not support running GitLab with JavaScript disabled in the browser and have no plans of supporting that
+in the future because we have features such as Issue Boards which require JavaScript extensively.

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

@@ -27,6 +27,7 @@ Prometheus server up and running. You have two options here:
 ## Specifying the Environment
 
 In order to isolate and only display relevant CPU and Memory metrics for a given environment, GitLab needs a method to detect which containers it is running. Because these metrics are tracked at the container level, traditional Kubernetes labels are not available.
+<<<<<<< HEAD
 
 Instead, the [Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) or [DaemonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) name should begin with [CI_ENVIRONMENT_SLUG](../../../../ci/variables/README.md#predefined-variables-environment-variables). It can be followed by a `-` and additional content if desired. For example, a deployment name of `review-homepage-5620p5` would match the `review/homepage` environment.
 
@@ -45,4 +46,10 @@ These metrics expect an `environment` label of the form `$CI_ENVIRONMENT_SLUG-ca
 | Name | Query |
 | ---- | ----- |
 | Average Memory Usage (MB) | (sum(avg(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}-canary"}) without (job))) / count(avg(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}-canary"}) without (job)) /1024/1024 |
-| Average CPU Utilization (%) | sum(avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}-canary"}[2m])) without (job)) * 100 |
\ No newline at end of file
+| Average CPU Utilization (%) | sum(avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}-canary"}[2m])) without (job)) * 100 |
+=======
+
+Instead, the [Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) or [DaemonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) name should begin with the name of the [environment](../../../../ci/environments.md). It can be followed by a `-` and additional content if desired. For example, a deployment name of `review-homepage-5620p5` would match the `review/homepage` environment.
+
+If you are using [GitLab Auto-Deploy](../../../../ci/autodeploy/index.md) and one of the two [provided Kubernetes monitoring solutions](../prometheus.md#getting-started-with-prometheus-monitoring), the naming will be correctly set automatically.
+>>>>>>> upstream/master