Merge branch 'master' into 48960-namespace-diff-module

* master:
  Resolve "MR refactor: Performance costs of main element with `v-if`"
  Add documentation on private projects
  Make blob and other RPC's mandatory
  Removed return statements from prettier script
  Add missing strings to `locale/gitlab.pot`
  Update `gettext:updated_check` regenerate pot file
  Include wget in apk add command
  [Rails5] Fix 'Invalid single-table inheritance type: Group is not a subclass of Gitlab::BackgroundMigration::FixCrossProjectLabelLinks::Namespace'
  Updated color
  Update doc on new option to add README when creating a project
  Make more things mandatory
  Updated (color of indent guide in Web IDE
  Make all Gitaly diff flags mandatory

1 files changed, 18 insertions, 1 deletions

diff --git a/app/assets/javascripts/diffs/components/inline_diff_view.vue b/app/assets/javascripts/diffs/components/inline_diff_view.vue
index 28a58e76ebe..9c1359f7c89 100644
--- a/app/assets/javascripts/diffs/components/inline_diff_view.vue
+++ b/app/assets/javascripts/diffs/components/inline_diff_view.vue
@@ -1,5 +1,5 @@
 <script>
-import { mapGetters } from 'vuex';
+import { mapGetters, mapState } from 'vuex';
 import inlineDiffTableRow from './inline_diff_table_row.vue';
 import inlineDiffCommentRow from './inline_diff_comment_row.vue';
 import { trimFirstCharOfLineContent } from '../store/utils';
@@ -21,6 +21,10 @@ export default {
   },
   computed: {
     ...mapGetters('diffs', ['commitId']),
+    ...mapGetters(['discussionsByLineCode']),
+    ...mapState({
+      diffLineCommentForms: state => state.diffs.diffLineCommentForms,
+    }),
     normalizedDiffLines() {
       return this.diffLines.map(line => (line.richText ? trimFirstCharOfLineContent(line) : line));
     },
@@ -31,6 +35,18 @@ export default {
       return window.gon.user_color_scheme;
     },
   },
+  methods: {
+    shouldRenderCommentRow(line) {
+      if (this.diffLineCommentForms[line.lineCode]) return true;
+
+      const lineDiscussions = this.discussionsByLineCode[line.lineCode];
+      if (lineDiscussions === undefined) {
+        return false;
+      }
+
+      return lineDiscussions.every(discussion => discussion.expanded);
+    },
+  },
 };
 </script>
 
@@ -50,6 +66,7 @@ export default {
           :key="line.lineCode"
         />
         <inline-diff-comment-row
+          v-if="shouldRenderCommentRow(line)"
           :diff-file="diffFile"
           :diff-lines="normalizedDiffLines"
           :line="line"