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
Léo-Paul Géneau
gitlab-ce
Commits
33233123
Commit
33233123
authored
Jan 19, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport to match EE icons
parent
1b51018e
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
15 additions
and
15 deletions
+15
-15
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js
...t_widget/components/states/mr_widget_auto_merge_failed.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js
...erge_request_widget/components/states/mr_widget_closed.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
...e_request_widget/components/states/mr_widget_conflicts.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.js
...est_widget/components/states/mr_widget_failed_to_merge.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js
...uest_widget/components/states/mr_widget_missing_branch.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js
...st_widget/components/states/mr_widget_pipeline_blocked.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js
...est_widget/components/states/mr_widget_pipeline_failed.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
...uest_widget/components/states/mr_widget_ready_to_merge.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js
...equest_widget/components/states/mr_widget_sha_mismatch.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
...get/components/states/mr_widget_unresolved_discussions.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js
...e_merge_request_widget/components/states/mr_widget_wip.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
...widget/components/states/mr_widget_ready_to_merge_spec.js
+4
-4
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.js
View file @
33233123
...
...
@@ -24,7 +24,7 @@ export default {
},
template
:
`
<div class="mr-widget-body media">
<status-icon status="
failed
" />
<status-icon status="
warning
" />
<div class="media-body space-children">
<span class="bold">
<template v-if="mr.mergeError">{{mr.mergeError}}.</template>
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.js
View file @
33233123
...
...
@@ -12,7 +12,7 @@ export default {
},
template
:
`
<div class="mr-widget-body media">
<status-icon status="
failed
" />
<status-icon status="
warning
" />
<div class="media-body">
<mr-widget-author-and-time
actionText="Closed by"
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js
View file @
33233123
...
...
@@ -11,7 +11,7 @@ export default {
template
:
`
<div class="mr-widget-body media">
<status-icon
status="
failed
"
status="
warning
"
:show-disabled-button="true" />
<div class="media-body space-children">
<span
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.js
View file @
33233123
...
...
@@ -51,7 +51,7 @@ export default {
</span>
</template>
<template v-else>
<status-icon status="
failed
" :show-disabled-button="true" />
<status-icon status="
warning
" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
<span
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.js
View file @
33233123
...
...
@@ -24,7 +24,7 @@ export default {
},
template
:
`
<div class="mr-widget-body media">
<status-icon status="
failed
" :show-disabled-button="true" />
<status-icon status="
warning
" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold js-branch-text">
<span class="capitalize">
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.js
View file @
33233123
...
...
@@ -7,7 +7,7 @@ export default {
},
template
:
`
<div class="mr-widget-body media">
<status-icon status="
failed
" :show-disabled-button="true" />
<status-icon status="
warning
" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
Pipeline blocked. The pipeline for this merge request requires a manual action to proceed
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_failed.js
View file @
33233123
...
...
@@ -7,7 +7,7 @@ export default {
},
template
:
`
<div class="mr-widget-body media">
<status-icon status="
failed
" :show-disabled-button="true" />
<status-icon status="
warning
" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
The pipeline for this merge request failed. Please retry the job or push a new commit to fix the failure
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
View file @
33233123
...
...
@@ -69,7 +69,7 @@ export default {
},
iconClass
()
{
if
(
this
.
status
===
'
failed
'
||
!
this
.
commitMessage
.
length
||
!
this
.
mr
.
isMergeAllowed
||
this
.
mr
.
preventMerge
)
{
return
'
failed
'
;
return
'
warning
'
;
}
return
'
success
'
;
},
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_sha_mismatch.js
View file @
33233123
...
...
@@ -7,7 +7,7 @@ export default {
},
template
:
`
<div class="mr-widget-body media">
<status-icon status="
failed
" :show-disabled-button="true" />
<status-icon status="
warning
" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
The source branch HEAD has recently changed. Please reload the page and review the changes before merging
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
View file @
33233123
...
...
@@ -10,7 +10,7 @@ export default {
},
template
:
`
<div class="mr-widget-body media">
<status-icon status="
failed
" :show-disabled-button="true" />
<status-icon status="
warning
" :show-disabled-button="true" />
<div class="media-body space-children">
<span class="bold">
There are unresolved discussions. Please resolve these discussions
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js
View file @
33233123
...
...
@@ -37,7 +37,7 @@ export default {
},
template
:
`
<div class="mr-widget-body media">
<status-icon status="
failed
" :show-disabled-button="Boolean(mr.removeWIPPath)" />
<status-icon status="
warning
" :show-disabled-button="Boolean(mr.removeWIPPath)" />
<div class="media-body space-children">
<span class="bold">
This is a Work in Progress
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
View file @
33233123
...
...
@@ -170,14 +170,14 @@ describe('MRWidgetReadyToMerge', () => {
expect
(
vm
.
iconClass
).
toEqual
(
'
success
'
);
});
it
(
'
shows
x
for failed status
'
,
()
=>
{
it
(
'
shows
warning icon
for failed status
'
,
()
=>
{
vm
.
mr
.
hasCI
=
true
;
expect
(
vm
.
iconClass
).
toEqual
(
'
failed
'
);
expect
(
vm
.
iconClass
).
toEqual
(
'
warning
'
);
});
it
(
'
shows
x
for merge not allowed
'
,
()
=>
{
it
(
'
shows
warning icon
for merge not allowed
'
,
()
=>
{
vm
.
mr
.
hasCI
=
true
;
expect
(
vm
.
iconClass
).
toEqual
(
'
failed
'
);
expect
(
vm
.
iconClass
).
toEqual
(
'
warning
'
);
});
});
...
...
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