Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
40f767e9
Commit
40f767e9
authored
Mar 04, 2019
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE backport of ee-parallel-diff-view
parent
f8b1ef92
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
app/assets/javascripts/diffs/components/parallel_diff_view.vue
...ssets/javascripts/diffs/components/parallel_diff_view.vue
+10
-0
app/assets/javascripts/diffs/mixins/draft_comments.js
app/assets/javascripts/diffs/mixins/draft_comments.js
+1
-0
No files found.
app/assets/javascripts/diffs/components/parallel_diff_view.vue
View file @
40f767e9
<
script
>
<
script
>
import
{
mapGetters
}
from
'
vuex
'
;
import
{
mapGetters
}
from
'
vuex
'
;
import
draftCommentsMixin
from
'
ee_else_ce/diffs/mixins/draft_comments
'
;
import
parallelDiffTableRow
from
'
./parallel_diff_table_row.vue
'
;
import
parallelDiffTableRow
from
'
./parallel_diff_table_row.vue
'
;
import
parallelDiffCommentRow
from
'
./parallel_diff_comment_row.vue
'
;
import
parallelDiffCommentRow
from
'
./parallel_diff_comment_row.vue
'
;
...
@@ -7,7 +8,10 @@ export default {
...
@@ -7,7 +8,10 @@ export default {
components
:
{
components
:
{
parallelDiffTableRow
,
parallelDiffTableRow
,
parallelDiffCommentRow
,
parallelDiffCommentRow
,
ParallelDraftCommentRow
:
()
=>
import
(
'
ee_component/batch_comments/components/parallel_draft_comment_row.vue
'
),
},
},
mixins
:
[
draftCommentsMixin
],
props
:
{
props
:
{
diffFile
:
{
diffFile
:
{
type
:
Object
,
type
:
Object
,
...
@@ -56,6 +60,12 @@ export default {
...
@@ -56,6 +60,12 @@ export default {
:line-index="index"
:line-index="index"
:help-page-path="helpPagePath"
:help-page-path="helpPagePath"
/>
/>
<parallel-draft-comment-row
v-if=
"shouldRenderParallelDraftRow(diffFile.file_hash, line)"
:key=
"`drafts-$
{index}`"
:line="line"
:diff-file-content-sha="diffFile.file_hash"
/>
</
template
>
</
template
>
</tbody>
</tbody>
</table>
</table>
...
...
app/assets/javascripts/diffs/mixins/draft_comments.js
View file @
40f767e9
export
default
{
export
default
{
computed
:
{
computed
:
{
shouldRenderDraftRow
:
()
=>
()
=>
false
,
shouldRenderDraftRow
:
()
=>
()
=>
false
,
shouldRenderParallelDraftRow
:
()
=>
()
=>
false
,
draftForLine
:
()
=>
()
=>
({}),
draftForLine
:
()
=>
()
=>
({}),
},
},
};
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment