Automatic merge of gitlab-org/gitlab-ce master

.gitlab/ci/qa.gitlab-ci.yml

@@ -10,34 +10,31 @@
     - install_gitlab_gem
     - ./scripts/trigger-build omnibus
   only:
-    - branches@gitlab-org/gitlab-ce
-    - branches@gitlab-org/gitlab-ee
-  except:
-    - master
+    refs:
+      - branches@gitlab-org/gitlab-ce
+      - branches@gitlab-org/gitlab-ee
 
 package-and-qa-manual:
-  extends:
-    - .package-and-qa-base
-    - .except-docs-qa
+  extends: .package-and-qa-base
   except:
     refs:
       - master
-  needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
   when: manual
+  needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
 
 package-and-qa-manual:master:
-  extends:
-    - .package-and-qa-base
-  needs: ["build-qa-image", "gitlab:assets:compile"]
+  extends: .package-and-qa-base
   only:
     refs:
       - master
   when: manual
+  needs: ["build-qa-image", "gitlab:assets:compile"]
 
 package-and-qa:
   extends: .package-and-qa-base
+  only:
+    refs:
+      - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce
+      - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ee
   needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
   allow_failure: true
-  only:
-    - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce
-    - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ee

.gitlab/ci/review.gitlab-ci.yml

@@ -40,7 +40,7 @@
 build-qa-image:
   extends:
     - .review-docker
-    - .except-docs-qa
+    - .except-docs
   only:
     refs:
       - branches@gitlab-org/gitlab-ce

doc/development/prometheus_metrics.md

@@ -44,3 +44,26 @@ class ImportCommonMetrics < ActiveRecord::Migration[4.2]
   end
 end
 ```
+
+## GitLab Prometheus metrics
+
+GitLab provides [Prometheus metrics](../administration/monitoring/prometheus/gitlab_metrics.md)
+to monitor itself.
+
+### Adding a new metric
+
+This section describes how to add new metrics for self-monitoring
+([example](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15440)).
+
+1. Select the [type of metric](https://gitlab.com/gitlab-org/prometheus-client-mmap#metrics):
+
+   - `Gitlab::Metrics.counter`
+   - `Gitlab::Metrics.gauge`
+   - `Gitlab::Metrics.histogram`
+   - `Gitlab::Metrics.summary`
+
+1. Select the appropriate name for your metric. Refer to the guidelines
+   for [Prometheus metric names](https://prometheus.io/docs/practices/naming/#metric-names).
+1. Update the list of [GitLab Prometheus metrics](../administration/monitoring/prometheus/gitlab_metrics.md).
+1. Trigger the relevant page/code that will record the new metric.
+1. Check that the new metric appears at `/-/metrics`.

doc/user/project/operations/feature_flags.md

@@ -2,10 +2,6 @@
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11845) in GitLab 11.4.
 
-CAUTION: **Warning:**
-This an _alpha_ feature and is subject to change at any time without
-prior notice.
-
 Feature flags allow you to ship a project in different flavors by
 dynamically toggling certain functionality.
 

package.json

 {
   "private": true,
   "scripts": {
-    "check-dependencies": "yarn check --integrity",
+    "check-dependencies": "scripts/frontend/check_dependencies.sh",
     "clean": "rm -rf public/assets tmp/cache/*-loader",
     "dev-server": "NODE_OPTIONS=\"--max-old-space-size=3584\" nodemon -w 'config/webpack.config.js' --exec 'webpack-dev-server --config config/webpack.config.js'",
     "eslint": "eslint --max-warnings 0 --report-unused-disable-directives --ext .js,.vue .",

scripts/frontend/check_dependencies.sh

+#!/usr/bin/env bash
+
+if ! yarn check --integrity 2>&1 > /dev/null
+then
+  echo
+  echo "    $(tput setaf 1)yarn check --integrity$(tput sgr0) failed!"
+  echo "    Your dependencies probably don't match the yarn.lock file."
+  echo "    Please run $(tput setaf 2)yarn install$(tput sgr0) and try again."
+  echo
+  exit 1
+fi