Add latest changes from gitlab-org/gitlab@master

2 files changed, 28 insertions, 3 deletions

diff --git a/doc/development/fe_guide/style/scss.md b/doc/development/fe_guide/style/scss.md
index 66fbbd1cb0c..b5e73050d6f 100644
--- a/doc/development/fe_guide/style/scss.md
+++ b/doc/development/fe_guide/style/scss.md
@@ -77,6 +77,24 @@ CSS classes should use the `lowercase-hyphenated` format rather than
 }
 ```
 
+Class names should be used instead of tag name selectors.
+Using tag name selectors are discouraged in CSS because
+they can affect unintended elements in the hierarchy.
+Also, since they are not meaningful names, they do not
+add meaning to the code.
+
+```scss
+// Bad
+ul {
+  color: #fff;
+}
+
+// Good
+.class-name {
+  color: #fff;
+}
+```
+
 ### Formatting
 
 You should always use a space before a brace, braces should be on the same
diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md
index 84f9d7f1c4a..9e6875312f3 100644
--- a/doc/topics/git/index.md
+++ b/doc/topics/git/index.md
@@ -27,12 +27,18 @@ The following resources will help you get started with Git:
 - [Git on the Server - GitLab](https://git-scm.com/book/en/v2/Git-on-the-Server-GitLab)
 - [How to install Git](how_to_install_git/index.md)
 - [Start using Git on the command line](../../gitlab-basics/start-using-git.md)
-- [Command Line basic commands](../../gitlab-basics/command-line-commands.md)
+- [Command line file editing basic commands](../../gitlab-basics/command-line-commands.md)
 - [GitLab Git Cheat Sheet (download)](https://about.gitlab.com/images/press/git-cheat-sheet.pdf)
 - Commits:
   - [Revert a commit](../../user/project/merge_requests/revert_changes.md#reverting-a-commit)
   - [Cherry-picking a commit](../../user/project/merge_requests/cherry_pick_changes.md#cherry-picking-a-commit)
   - [Squashing commits](../gitlab_flow.md#squashing-commits-with-rebase)
+  - [Squash-and-merge](../../user/project/merge_requests/squash_and_merge.md)
+  - [Signing commits](../../user/project/repository/gpg_signed_commits/index.md)
+- [Git stash](../../university/training/topics/stash.md)
+- [Git file blame](../../user/project/repository/git_blame.md)
+- [Git file history](../../user/project/repository/git_history.md)
+- [Git tags](../../university/training/user_training.md#tags)
 
 ### Concepts
 
@@ -61,9 +67,10 @@ If you have problems with Git, the following may help:
 
 ## Branching strategies
 
+- [Feature branch workflow](../../gitlab-basics/feature_branch_workflow.md)
+- [GitLab Flow](../gitlab_flow.md)
 - [Git Branching - Branches in a Nutshell](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell)
 - [Git Branching - Branching Workflows](https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows)
-- [GitLab Flow](https://about.gitlab.com/blog/2014/09/29/gitlab-flow/)
 
 ## Advanced use
 
@@ -88,5 +95,5 @@ The following relate to Git Large File Storage:
 - [Removing objects from LFS](lfs/index.md#removing-objects-from-lfs)
 - [GitLab Git LFS user documentation](lfs/index.md)
 - [GitLab Git LFS admin documentation](../../administration/lfs/index.md)
-- [git-annex to Git-LFS migration guide](lfs/migrate_from_git_annex_to_git_lfs.md)
+- [Git Annex to Git LFS migration guide](lfs/migrate_from_git_annex_to_git_lfs.md)
 - [Towards a production quality open source Git LFS server](https://about.gitlab.com/blog/2015/08/13/towards-a-production-quality-open-source-git-lfs-server/)