Automatic merge of gitlab-org/gitlab-ce master

doc/topics/git/useful_git_commands.md

@@ -149,7 +149,7 @@ gitk --follow <file>
 
 ### Use a custom SSH key for a git command
 
-```text
+```sh
 GIT_SSH_COMMAND="ssh -i ~/.ssh/gitlabadmin" git <command>
 ```
 
@@ -157,13 +157,13 @@ GIT_SSH_COMMAND="ssh -i ~/.ssh/gitlabadmin" git <command>
 
 With SSH:
 
-```text
+```sh
 GIT_SSH_COMMAND="ssh -vvv" git clone <git@url>
 ```
 
 With HTTPS:
 
-```text
+```sh
 GIT_TRACE_PACKET=1 GIT_TRACE=2 GIT_CURL_VERBOSE=1 git clone <url>
 ```
 

doc/user/project/labels.md

@@ -93,8 +93,10 @@ GitLab will add the following default labels to the project:
 To create a **group label**, navigate to **Issues > Labels** in the **group** and create
 it from there. This page only shows group labels in this group.
 
-Alternatively, you can create group labels from the Epic sidebar. Please note that the
-created label will belong to the immediate group to which the epic belongs. **(ULTIMATE)**
+Alternatively, you can create group labels from the Epic sidebar. **(ULTIMATE)**
+
+Please note that the created label will belong to the immediate group to which the
+epic belongs.
 
 ![Create Labels from Epic](img/labels_epic_sidebar_v12_1.png)