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
15319208
Commit
15319208
authored
Aug 10, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflicts for app/assets/javascripts/reports/components/issues_list.vue
parent
2bc20a6e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
8 deletions
+0
-8
app/assets/javascripts/reports/components/issues_list.vue
app/assets/javascripts/reports/components/issues_list.vue
+0
-8
No files found.
app/assets/javascripts/reports/components/issues_list.vue
View file @
15319208
<
script
>
<<<<<<<
HEAD
:
app
/
assets
/
javascripts
/
reports
/
components
/
issues_list
.
vue
import
IssuesBlock
from
'
~/reports/components/report_issues.vue
'
;
=======
import
IssuesBlock
from
'
./report_issues.vue
'
;
>>>>>>>
upstream
/
master
:
app
/
assets
/
javascripts
/
reports
/
components
/
issues_list
.
vue
import
{
STATUS_SUCCESS
,
STATUS_FAILED
,
STATUS_NEUTRAL
,
<<<<<<<
HEAD
:
app
/
assets
/
javascripts
/
reports
/
components
/
issues_list
.
vue
}
from
'
~/reports/constants
'
;
import
{
componentNames
}
from
'
ee/vue_shared/components/reports/issue_body
'
;
import
SastContainerInfo
from
'
ee/vue_shared/security_reports/components/sast_container_info.vue
'
;
=======
}
from
'
../constants
'
;
>>>>>>>
upstream
/
master
:
app
/
assets
/
javascripts
/
reports
/
components
/
issues_list
.
vue
/**
* Renders block of issues
...
...
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