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
Tatuya Kamada
gitlab-ce
Commits
774434f4
Commit
774434f4
authored
Jul 11, 2016
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added dummy merge conflicts data.
parent
907317c4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
95 additions
and
0 deletions
+95
-0
app/assets/javascripts/merge_conflicts_data.coffee
app/assets/javascripts/merge_conflicts_data.coffee
+95
-0
No files found.
app/assets/javascripts/merge_conflicts_data.coffee
0 → 100644
View file @
774434f4
window
.
mergeConflictsData
=
{
"target_branch"
:
"master"
,
"source_branch"
:
"mc-ui"
,
"files"
:
[
{
"commit_sha"
:
"b5fa56eb3f2cea5e21c68b43c7c22b5b96e0e7b3"
,
"old_path"
:
"lib/component.js"
,
"new_path"
:
"lib/component.js"
,
"sections"
:
[
{
"conflict"
:
false
,
"lines"
:
[
{
"type"
:
null
,
"old_line"
:
206
,
"new_line"
:
206
,
"text"
:
""
},
{
"type"
:
null
,
"old_line"
:
207
,
"new_line"
:
207
,
"text"
:
"var options = utils.merge.apply(utils, args);"
}
]
},
{
"conflict"
:
true
,
"id"
:
"section-id-123"
,
"lines"
:
[
{
"type"
:
"old"
,
"old_line"
:
208
,
"new_line"
:
null
,
"text"
:
"$(selector).each(function(i, rawNode) {"
},
{
"type"
:
"old"
,
"old_line"
:
209
,
"new_line"
:
null
,
"text"
:
"var componentInfo = registry.findComponentInfo(this)"
},
{
"type"
:
"old"
,
"old_line"
:
210
,
"new_line"
:
null
,
"text"
:
"if (componentInfo && componentInfo.isAttachedTo(rawNode)) {"
},
{
"type"
:
"new"
,
"old_line"
:
null
,
"new_line"
:
208
,
"text"
:
"$(selector).each(function(i, node) {"
},
{
"type"
:
"new"
,
"old_line"
:
null
,
"new_line"
:
209
,
"text"
:
"if (componentInfo && componentInfo.isAttachedTo(node)) {"
}
]
},
{
"conflict"
:
false
,
"lines"
:
[
{
"type"
:
null
,
"old_line"
:
211
,
"new_line"
:
210
,
"text"
:
"return;"
},
{
"type"
:
null
,
"old_line"
:
212
,
"new_line"
:
211
,
"text"
:
"}"
},
{
"type"
:
null
,
"old_line"
:
null
,
"new_line"
:
212
,
"text"
:
""
},
{
"type"
:
null
,
"old_line"
:
213
,
"new_line"
:
213
,
"text"
:
""
}
]
}
]
}
]
}
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