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
78c7c11d
Commit
78c7c11d
authored
Nov 03, 2016
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VueJS migration, replace {{{ with v-html
parent
99b421da
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
app/views/projects/merge_requests/conflicts/components/_inline_conflict_lines.html.haml
...sts/conflicts/components/_inline_conflict_lines.html.haml
+2
-3
app/views/projects/merge_requests/conflicts/components/_parallel_conflict_line.html.haml
...ts/conflicts/components/_parallel_conflict_line.html.haml
+1
-2
No files found.
app/views/projects/merge_requests/conflicts/components/_inline_conflict_lines.html.haml
View file @
78c7c11d
...
@@ -5,11 +5,10 @@
...
@@ -5,11 +5,10 @@
%a
{{line.new_line}}
%a
{{line.new_line}}
%td
.diff-line-num.old_line
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"!line.isHeader"
}
%td
.diff-line-num.old_line
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"!line.isHeader"
}
%a
{{line.old_line}}
%a
{{line.old_line}}
%td
.line_content
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"!line.isHeader"
}
%td
.line_content
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"!line.isHeader"
,
"v-html"
=>
"line.richText"
}
{{{line.richText}}}
%td
.diff-line-num.header
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"line.isHeader"
}
%td
.diff-line-num.header
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"line.isHeader"
}
%td
.diff-line-num.header
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"line.isHeader"
}
%td
.diff-line-num.header
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"line.isHeader"
}
%td
.line_content.header
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"line.isHeader"
}
%td
.line_content.header
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"line.isHeader"
}
%strong
{{{line.richText}}
}
%strong
{
"v-html"
=>
"line.richText"
}
%button
.btn
{
"@click"
=>
"handleSelected(file, line.id, line.section)"
}
%button
.btn
{
"@click"
=>
"handleSelected(file, line.id, line.section)"
}
{{line.buttonTitle}}
{{line.buttonTitle}}
app/views/projects/merge_requests/conflicts/components/_parallel_conflict_line.html.haml
View file @
78c7c11d
...
@@ -6,5 +6,4 @@
...
@@ -6,5 +6,4 @@
{{line.buttonTitle}}
{{line.buttonTitle}}
%td
.diff-line-num.old_line
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"!line.isHeader"
}
%td
.diff-line-num.old_line
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"!line.isHeader"
}
{{line.lineNumber}}
{{line.lineNumber}}
%td
.line_content.parallel
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"!line.isHeader"
}
%td
.line_content.parallel
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"!line.isHeader"
,
"v-html"
=>
"line.richText"
}
{{{line.richText}}}
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