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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
c1514624
Commit
c1514624
authored
Aug 10, 2016
by
Douwe Maan
Committed by
Fatih Acet
Aug 12, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor code style tweaks in views
parent
c19ad19e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
app/views/projects/merge_requests/conflicts/_inline_view.html.haml
.../projects/merge_requests/conflicts/_inline_view.html.haml
+6
-7
app/views/projects/merge_requests/conflicts/_parallel_view.html.haml
...rojects/merge_requests/conflicts/_parallel_view.html.haml
+6
-5
No files found.
app/views/projects/merge_requests/conflicts/_inline_view.html.haml
View file @
c1514624
...
@@ -11,19 +11,18 @@
...
@@ -11,19 +11,18 @@
.diff-wrap-lines.code.file-content.js-syntax-highlight
.diff-wrap-lines.code.file-content.js-syntax-highlight
%table
%table
%tr
.line_holder.diff-inline
{
"v-for"
=>
"line in file.inlineLines"
}
%tr
.line_holder.diff-inline
{
"v-for"
=>
"line in file.inlineLines"
}
%template
{
"v-if"
=>
"!line.isHeader"
}
%template
{
"v-if"
=>
"!line.isHeader"
}
%td
.diff-line-num.new_line
{
":class"
=>
"#{class_bindings}"
}
%td
.diff-line-num.new_line
{
":class"
=>
class_bindings
}
%a
{{line.new_line}}
%a
{{line.new_line}}
%td
.diff-line-num.old_line
{
":class"
=>
"#{class_bindings}"
}
%td
.diff-line-num.old_line
{
":class"
=>
class_bindings
}
%a
{{line.old_line}}
%a
{{line.old_line}}
%td
.line_content
{
":class"
=>
"#{class_bindings}"
}
%td
.line_content
{
":class"
=>
class_bindings
}
{{{line.richText}}}
{{{line.richText}}}
%template
{
"v-if"
=>
"line.isHeader"
}
%template
{
"v-if"
=>
"line.isHeader"
}
%td
.diff-line-num.header
{
":class"
=>
"#{class_bindings}"
}
%td
.diff-line-num.header
{
":class"
=>
class_bindings
}
%td
.diff-line-num.header
{
":class"
=>
"#{class_bindings}"
}
%td
.diff-line-num.header
{
":class"
=>
class_bindings
}
%td
.line_content.header
{
":class"
=>
"#{class_bindings}"
}
%td
.line_content.header
{
":class"
=>
class_bindings
}
%strong
{{{line.richText}}}
%strong
{{{line.richText}}}
%button
.btn
{
"@click"
=>
"handleSelected(line.id, line.section)"
}
%button
.btn
{
"@click"
=>
"handleSelected(line.id, line.section)"
}
{{line.buttonTitle}}
{{line.buttonTitle}}
app/views/projects/merge_requests/conflicts/_parallel_view.html.haml
View file @
c1514624
.files
{
"v-show"
=>
"isParallel"
}
.files
{
"v-show"
=>
"isParallel"
}
.diff-file.file-holder.conflict.parallel-view
{
"v-for"
=>
"file in conflictsData.files"
}
.diff-file.file-holder.conflict.parallel-view
{
"v-for"
=>
"file in conflictsData.files"
}
.file-title
.file-title
%i
.fa.fa-fw
.fa
{
":class"
=>
"file.iconClass"
}
%i
.fa.fa-fw
{
":class"
=>
"file.iconClass"
}
%strong
{{file.filePath}}
%strong
{{file.filePath}}
.file-actions
.file-actions
%a
.btn.view-file.btn-file-option
{
":href"
=>
"file.blobPath"
}
%a
.btn.view-file.btn-file-option
{
":href"
=>
"file.blobPath"
}
View file @{{conflictsData.shortCommitSha}}
View file @{{conflictsData.shortCommitSha}}
.diff-content.diff-wrap-lines
.diff-content.diff-wrap-lines
.diff-wrap-lines.code.file-content.js-syntax-highlight
.diff-wrap-lines.code.file-content.js-syntax-highlight
%table
%table
...
@@ -13,14 +14,14 @@
...
@@ -13,14 +14,14 @@
%template
{
"v-for"
=>
"line in section"
}
%template
{
"v-for"
=>
"line in section"
}
%template
{
"v-if"
=>
"line.isHeader"
}
%template
{
"v-if"
=>
"line.isHeader"
}
%td
.diff-line-num.header
{
":class"
=>
"#{class_bindings}"
}
%td
.diff-line-num.header
{
":class"
=>
class_bindings
}
%td
.line_content.header
{
":class"
=>
"#{class_bindings}"
}
%td
.line_content.header
{
":class"
=>
class_bindings
}
%strong
{{line.richText}}
%strong
{{line.richText}}
%button
.btn
{
"@click"
=>
"handleSelected(line.id, line.section)"
}
%button
.btn
{
"@click"
=>
"handleSelected(line.id, line.section)"
}
{{line.buttonTitle}}
{{line.buttonTitle}}
%template
{
"v-if"
=>
"!line.isHeader"
}
%template
{
"v-if"
=>
"!line.isHeader"
}
%td
.diff-line-num.old_line
{
":class"
=>
"#{class_bindings}"
}
%td
.diff-line-num.old_line
{
":class"
=>
class_bindings
}
{{line.lineNumber}}
{{line.lineNumber}}
%td
.line_content.parallel
{
":class"
=>
"#{class_bindings}"
}
%td
.line_content.parallel
{
":class"
=>
class_bindings
}
{{{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