Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/framework/common.scss

@@ -467,3 +467,7 @@ img.emoji {
     background-color: $gray-600;
   }
 }
+
+.cursor-pointer {
+  cursor: pointer;
+}

app/assets/stylesheets/framework/variables_overrides.scss

@@ -41,5 +41,6 @@ $spacers: (
   2: ($spacer),
   3: ($spacer * 2),
   4: ($spacer * 3),
-  5: ($spacer * 4)
+  5: ($spacer * 4),
+  6: ($spacer * 8)
 );