Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/framework/awards.scss

@@ -236,7 +236,7 @@
     }
 
     path {
-      fill: $border-gray-normal;
+      fill: $gray-700;
     }
   }
 

app/assets/stylesheets/pages/events.scss

@@ -156,6 +156,10 @@
         &:hover {
           background: none;
         }
+
+        a {
+          color: $blue-600;
+        }
       }
     }
   }

app/views/events/event/_push.html.haml

@@ -32,7 +32,8 @@
             - from_label = from
 
           = link_to project_compare_path(project, from: from, to: event.commit_to) do
-            Compare #{from_label}...#{truncate_sha(event.commit_to)}
+            %span Compare
+            %span.commit-sha #{from_label}...#{truncate_sha(event.commit_to)}
 
           - if create_mr
             %span

changelogs/unreleased/61049-links-activity-stream.yml

+---
+title: Use blue for activity stream links; use monospace font for commit sha
+merge_request:
+author:
+type: other

changelogs/unreleased/61393-emoji-button.yml

+---
+title: Change default color of award emoji button
+merge_request:
+author:
+type: other

doc/development/i18n/externalization.md

@@ -195,6 +195,7 @@ For example use `%{created_at}` in Ruby but `%{createdAt}` in JavaScript.
 
 Sometimes you need to add some context to the text that you want to translate
 (if the word occurs in a sentence and/or the word is ambiguous).
+Namespaces should be PascalCase.
 
 - In Ruby/HAML: