Automatic merge of gitlab-org/gitlab-ce master

doc/install/openshift_and_gitlab/index.md

@@ -8,6 +8,12 @@ date: 2016-06-28
 
 # How to install GitLab on OpenShift Origin 3
 
+CAUTION: **Deprecated:**
+This article is deprecated. Use the official Kubernetes Helm charts for
+installing GitLab to OpenShift. Check out the
+[official installation docs](https://gitlab.com/charts/gitlab/blob/master/doc/cloud/openshift.md)
+for details.
+
 ## Introduction
 
 [OpenShift Origin][openshift] is an open source container application

package.json

@@ -26,7 +26,7 @@
     "@babel/plugin-syntax-import-meta": "^7.0.0",
     "@babel/preset-env": "^7.1.0",
     "@gitlab/csslab": "^1.8.0",
-    "@gitlab/svgs": "^1.43.0",
+    "@gitlab/svgs": "^1.47.0",
     "@gitlab/ui": "^1.18.0",
     "apollo-boost": "^0.1.20",
     "apollo-client": "^2.4.5",

yarn.lock

@@ -636,10 +636,10 @@
     eslint-plugin-promise "^4.0.1"
     eslint-plugin-vue "^5.0.0"
 
-"@gitlab/svgs@^1.43.0":
-  version "1.43.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.43.0.tgz#28dee2122d068cd3b925cd9884d97465ebaca12d"
-  integrity sha512-wuN3NITmyBV9bOXsFfAjtndFrjTlH6Kf3+6aqT5kHKKLe/B4w7uTU1L9H/cyR0wGD7HbOh584a05eDcuH04fPA==
+"@gitlab/svgs@^1.47.0":
+  version "1.47.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.47.0.tgz#c03dda41aefd3889cbfed95a391836106ae2ac4d"
+  integrity sha512-0Bx/HxqR8xpqqaLnZiFAHIh1jTAFQPFToVZ6Wi3QyhsAwmXRAbgw1SlkRMZ7w3e6l+G71Wnw+GnI4rx1gK8JLQ==
 
 "@gitlab/ui@^1.18.0":
   version "1.18.0"