diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-11-08 07:58:45 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-11-08 07:58:45 +0000 |
commit | 15e519451e843b6d55a2c35bbefe039003b15c25 (patch) | |
tree | d7deeb2234938180fda92f17ebcfad22611fd07f /app/assets/javascripts/diffs/components/diff_discussions.vue | |
parent | b5a79f15369678fd959e6db290e2f29eab3ca84c (diff) | |
parent | cd5ddc4f2e3088a906417741a019292479ab84a6 (diff) | |
download | gitlab-ce-15e519451e843b6d55a2c35bbefe039003b15c25.tar.gz |
Merge branch '_acet-discussion-redesign' into 'master'
Discussions redesign
Closes #29294
See merge request gitlab-org/gitlab-ce!22333
Diffstat (limited to 'app/assets/javascripts/diffs/components/diff_discussions.vue')
-rw-r--r-- | app/assets/javascripts/diffs/components/diff_discussions.vue | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_discussions.vue b/app/assets/javascripts/diffs/components/diff_discussions.vue index e19207bdc95..b9de487a737 100644 --- a/app/assets/javascripts/diffs/components/diff_discussions.vue +++ b/app/assets/javascripts/diffs/components/diff_discussions.vue @@ -76,7 +76,6 @@ export default { <noteable-discussion v-show="isExpanded(discussion)" :discussion="discussion" - :render-header="false" :render-diff-file="false" :always-expanded="true" :discussions-by-diff-order="true" |