Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/pages/diff.scss

@@ -431,9 +431,9 @@ table.code {
     &.diff-line-num {
       user-select: none;
       margin: 0;
-      border: 0;
       padding: 0 10px 0 5px;
-      border-right: 1px solid;
+      border-right-width: 1px;
+      border-right-style: solid;
       text-align: right;
       width: 50px;
       position: relative;

doc/user/profile/account/delete_account.md

@@ -14,7 +14,7 @@ Deleting a user will delete all projects in that user namespace.
   [GitLab 9.1][ce-10273], and from the API in [GitLab 9.3][ce-11853].
 
 When a user account is deleted, not all associated records are deleted with it.
-Here's a list of things that will not be deleted:
+Here's a list of things that will **not** be deleted:
 
 - Issues that the user created
 - Merge requests that the user created

doc/user/project/clusters/index.md

@@ -124,26 +124,26 @@ To add an existing Kubernetes cluster to your project:
 
       1. Create a file called `gitlab-admin-service-account.yaml` with contents:
 
-          ```yaml
-          apiVersion: v1
-          kind: ServiceAccount
-          metadata:
-            name: gitlab-admin
-            namespace: kube-system
-          ---
-          apiVersion: rbac.authorization.k8s.io/v1beta1
-          kind: ClusterRoleBinding
-          metadata:
-            name: gitlab-admin
-          roleRef:
-            apiGroup: rbac.authorization.k8s.io
-            kind: ClusterRole
-            name: cluster-admin
-          subjects:
-          - kind: ServiceAccount
-            name: gitlab-admin
-            namespace: kube-system
-          ```
+         ```yaml
+         apiVersion: v1
+         kind: ServiceAccount
+         metadata:
+           name: gitlab-admin
+           namespace: kube-system
+         ---
+         apiVersion: rbac.authorization.k8s.io/v1beta1
+         kind: ClusterRoleBinding
+         metadata:
+           name: gitlab-admin
+         roleRef:
+           apiGroup: rbac.authorization.k8s.io
+           kind: ClusterRole
+           name: cluster-admin
+         subjects:
+         - kind: ServiceAccount
+           name: gitlab-admin
+           namespace: kube-system
+         ```
 
       1. Apply the service account and cluster role binding to your cluster: