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
ca8f95c2
Commit
ca8f95c2
authored
Apr 20, 2018
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflict: app/assets/javascripts/boards/models/list.js
parent
1d21ca57
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
app/assets/javascripts/boards/models/list.js
app/assets/javascripts/boards/models/list.js
+0
-3
No files found.
app/assets/javascripts/boards/models/list.js
View file @
ca8f95c2
...
...
@@ -114,11 +114,8 @@ class List {
issue
.
iid
=
data
.
iid
;
issue
.
milestone
=
data
.
milestone
;
issue
.
project
=
data
.
project
;
<<<<<<<
HEAD
issue
.
assignees
=
data
.
assignees
;
issue
.
labels
=
data
.
labels
;
=======
>>>>>>>
upstream
/
master
issue
.
path
=
data
.
real_path
;
issue
.
referencePath
=
data
.
reference_path
;
...
...
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