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
e842b79d
Commit
e842b79d
authored
Mar 05, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move UnresolvedDiscussions vue component
parent
96a3847e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
32 deletions
+43
-32
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
...get/components/states/mr_widget_unresolved_discussions.js
+0
-27
app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
...quest_widget/components/states/unresolved_discussions.vue
+33
-0
app/assets/javascripts/vue_merge_request_widget/dependencies.js
...sets/javascripts/vue_merge_request_widget/dependencies.js
+1
-1
changelogs/unreleased/refactor-move-mr-widget-unresolved-discussions-vue-component.yml
...r-move-mr-widget-unresolved-discussions-vue-component.yml
+5
-0
spec/javascripts/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js
...omponents/states/mr_widget_unresolved_discussions_spec.js
+4
-4
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions.js
deleted
100644 → 0
View file @
96a3847e
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
export
default
{
name
:
'
MRWidgetUnresolvedDiscussions
'
,
props
:
{
mr
:
{
type
:
Object
,
required
:
true
},
},
components
:
{
statusIcon
,
},
template
:
`
<div class="mr-widget-body media">
<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
</span>
<a
v-if="mr.createIssueToResolveDiscussionsPath"
:href="mr.createIssueToResolveDiscussionsPath"
class="btn btn-default btn-xs js-create-issue">
Create an issue to resolve them later
</a>
</div>
</div>
`
,
};
app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
0 → 100644
View file @
e842b79d
<
script
>
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
export
default
{
name
:
'
UnresolvedDiscussions
'
,
components
:
{
statusIcon
,
},
props
:
{
mr
:
{
type
:
Object
,
required
:
true
},
},
};
</
script
>
<
template
>
<div
class=
"mr-widget-body media"
>
<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
</span>
<a
v-if=
"mr.createIssueToResolveDiscussionsPath"
:href=
"mr.createIssueToResolveDiscussionsPath"
class=
"btn btn-default btn-xs js-create-issue"
>
Create an issue to resolve them later
</a>
</div>
</div>
</
template
>
app/assets/javascripts/vue_merge_request_widget/dependencies.js
View file @
e842b79d
...
...
@@ -29,7 +29,7 @@ export { default as MissingBranchState } from './components/states/mr_widget_mis
export
{
default
as
NotAllowedState
}
from
'
./components/states/mr_widget_not_allowed.vue
'
;
export
{
default
as
ReadyToMergeState
}
from
'
./components/states/mr_widget_ready_to_merge
'
;
export
{
default
as
SHAMismatchState
}
from
'
./components/states/mr_widget_sha_mismatch
'
;
export
{
default
as
UnresolvedDiscussionsState
}
from
'
./components/states/
mr_widget_unresolved_discussions
'
;
export
{
default
as
UnresolvedDiscussionsState
}
from
'
./components/states/
unresolved_discussions.vue
'
;
export
{
default
as
PipelineBlockedState
}
from
'
./components/states/mr_widget_pipeline_blocked.vue
'
;
export
{
default
as
PipelineFailedState
}
from
'
./components/states/mr_widget_pipeline_failed
'
;
export
{
default
as
MergeWhenPipelineSucceedsState
}
from
'
./components/states/mr_widget_merge_when_pipeline_succeeds.vue
'
;
...
...
changelogs/unreleased/refactor-move-mr-widget-unresolved-discussions-vue-component.yml
0 → 100644
View file @
e842b79d
---
title
:
Move UnresolvedDiscussions vue component
merge_request
:
17538
author
:
George Tsiolis
type
:
performance
spec/javascripts/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js
View file @
e842b79d
import
Vue
from
'
vue
'
;
import
unresolvedDiscussionsComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_unresolved_discussions
'
;
import
UnresolvedDiscussions
from
'
~/vue_merge_request_widget/components/states/unresolved_discussions.vue
'
;
describe
(
'
MRWidget
UnresolvedDiscussions
'
,
()
=>
{
describe
(
'
UnresolvedDiscussions
'
,
()
=>
{
describe
(
'
props
'
,
()
=>
{
it
(
'
should have props
'
,
()
=>
{
const
{
mr
}
=
unresolvedDiscussionsComponent
.
props
;
const
{
mr
}
=
UnresolvedDiscussions
.
props
;
expect
(
mr
.
type
instanceof
Object
).
toBeTruthy
();
expect
(
mr
.
required
).
toBeTruthy
();
...
...
@@ -17,7 +17,7 @@ describe('MRWidgetUnresolvedDiscussions', () => {
const
path
=
'
foo/bar
'
;
beforeEach
(()
=>
{
const
Component
=
Vue
.
extend
(
unresolvedDiscussionsComponent
);
const
Component
=
Vue
.
extend
(
UnresolvedDiscussions
);
const
mr
=
{
createIssueToResolveDiscussionsPath
:
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