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
f7d7ff3a
Commit
f7d7ff3a
authored
Jul 27, 2018
by
Lukas Eipert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolve conflict in `app/assets/javascripts/vue_shared/components/reports/issues_list.vue`
parent
c02356b4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
6 deletions
+0
-6
app/assets/javascripts/vue_shared/components/reports/issues_list.vue
...javascripts/vue_shared/components/reports/issues_list.vue
+0
-6
No files found.
app/assets/javascripts/vue_shared/components/reports/issues_list.vue
View file @
f7d7ff3a
...
...
@@ -5,12 +5,9 @@ import {
STATUS_FAILED
,
STATUS_NEUTRAL
,
}
from
'
~/vue_shared/components/reports/constants
'
;
<<<<<<<
HEAD
import
{
componentNames
}
from
'
ee/vue_shared/components/reports/issue_body
'
;
import
SastContainerInfo
from
'
ee/vue_shared/security_reports/components/sast_container_info.vue
'
;
=======
>>>>>>>
upstream
/
master
/**
* Renders block of issues
...
...
@@ -21,10 +18,7 @@ export default {
IssuesBlock
,
SastContainerInfo
,
},
<<<<<<<
HEAD
componentNames
,
=======
>>>>>>>
upstream
/
master
success
:
STATUS_SUCCESS
,
failed
:
STATUS_FAILED
,
neutral
:
STATUS_NEUTRAL
,
...
...
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