Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/framework/markdown_area.scss

@@ -153,14 +153,6 @@
     margin: 10px 0;
   }
 
-  // Border around images in issue and MR comments.
-  img:not(.emoji) {
-    border: 1px solid $white-normal;
-    padding: 5px;
-    margin: 5px 0;
-    // Ensure that image does not exceed viewport
-    max-height: calc(100vh - 100px);
-  }
 
   table:not(.js-syntax-highlight) {
     @include markdown-table;

app/assets/stylesheets/framework/typography.scss

@@ -371,6 +371,16 @@ code {
 
 .md:not(.use-csslab) {
   @include md-typography;
+
+  &:not(.wiki) {
+    img:not(.emoji) {
+      border: 1px solid $white-normal;
+      padding: 5px;
+      margin: 5px 0;
+      // Ensure that image does not exceed viewport
+      max-height: calc(100vh - 100px);
+    }
+  }
 }
 
 /**

changelogs/unreleased/55703-md-image-borders.yml

+---
+title: Only show borders for markdown images in notes
+merge_request: 25448
+author:
+type: fixed