Merge branch 'master' into 'ce-to-ee-2018-07-24'

[ci skip]

# Conflicts:
#   doc/user/profile/personal_access_tokens.md

doc/user/profile/personal_access_tokens.md

@@ -48,7 +48,7 @@ the following table.
 | `api` | Grants complete access to the API (read/write) ([introduced][ce-5951] in GitLab 8.15). Required for accessing Git repositories over HTTP when 2FA is enabled. |
 | `read_registry` | Allows to read [container registry] images if a project is private and authorization is required ([introduced][ce-11845] in GitLab 9.3). |
 | `sudo` | Allows performing API actions as any user in the system (if the authenticated user is an admin) ([introduced][ce-14838] in GitLab 10.2). |
-| `read_repository` | Allows read-access to the repository through git clone). |
+| `read_repository` | Allows read-access to the repository through git clone. |
 
 [2fa]: ../account/two_factor_authentication.md
 [api]: ../../api/README.md

ee/app/views/admin/licenses/show.html.haml

@@ -52,8 +52,8 @@
               %strong Expired
 
   .col-md-6
-    .card.bg-info
-      .card-header
+    .card.border-info
+      .card-header.bg-info.text-white
         Download license
       .card-body
         %p Your license will be included in your GitLab backup and will survive upgrades, so in normal usage you should never need to re-upload your <code>.gitlab-license</code> file.
@@ -62,8 +62,8 @@
         = link_to 'Download license', download_admin_license_path, class: "btn btn-info"
 
 
-    .card.bg-danger
-      .card-header
+    .card.border-danger
+      .card-header.bg-danger.text-white
         Remove license
       .card-body
         %p If you remove this license, GitLab will fall back on the previous license, if any.