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
5b5d1818
Commit
5b5d1818
authored
Dec 20, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update text and variable case
parent
9c8e6747
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
...javascripts/vue_merge_request_widget/mr_widget_options.js
+4
-4
ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+1
-1
spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
.../javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
View file @
5b5d1818
...
...
@@ -41,7 +41,7 @@ export default {
return
this
.
mr
.
sast
;
},
shouldRenderDockerReport
()
{
return
this
.
mr
.
sast
_c
ontainer
;
return
this
.
mr
.
sast
C
ontainer
;
},
codequalityText
()
{
const
{
newIssues
,
resolvedIssues
}
=
this
.
mr
.
codeclimateMetrics
;
...
...
@@ -245,7 +245,7 @@ export default {
},
fetchDockerReport
()
{
const
{
path
}
=
this
.
mr
.
sast
_c
ontainer
;
const
{
path
}
=
this
.
mr
.
sast
C
ontainer
;
this
.
isLoadingDocker
=
true
;
this
.
service
.
fetchReport
(
path
)
...
...
@@ -340,8 +340,8 @@ export default {
v-if="shouldRenderDockerReport"
type="docker"
:status="dockerStatus"
:loading-text="translateText('sast
_
container').loading"
:error-text="translateText('sast
_
container').error"
:loading-text="translateText('sast
:
container').loading"
:error-text="translateText('sast
:
container').error"
:success-text="dockerText"
:unresolved-issues="mr.dockerReport.unapproved"
:neutral-issues="mr.dockerReport.approved"
...
...
ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
5b5d1818
...
...
@@ -73,7 +73,7 @@ export default class MergeRequestStore extends CEMergeRequestStore {
}
initDockerReport
(
data
)
{
this
.
sast
_c
ontainer
=
data
.
sast_container
;
this
.
sast
C
ontainer
=
data
.
sast_container
;
this
.
dockerReport
=
{
approved
:
[],
unapproved
:
[],
...
...
spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
View file @
5b5d1818
...
...
@@ -115,7 +115,7 @@ describe('MergeRequestStore', () => {
it
(
'
sets the defaults
'
,
()
=>
{
store
.
initDockerReport
({
sast_container
:
{
path
:
'
gl-sast-container.json
'
}
});
expect
(
store
.
sast
_c
ontainer
).
toEqual
({
path
:
'
gl-sast-container.json
'
});
expect
(
store
.
sast
C
ontainer
).
toEqual
({
path
:
'
gl-sast-container.json
'
});
expect
(
store
.
dockerReport
).
toEqual
({
approved
:
[],
unapproved
:
[],
...
...
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