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
Boxiang Sun
gitlab-ce
Commits
ece35021
Commit
ece35021
authored
May 10, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes eslint
parent
e9e414a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
37 additions
and
36 deletions
+37
-36
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
...avascripts/vue_merge_request_widget/mr_widget_options.vue
+37
-36
No files found.
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @
ece35021
...
@@ -41,10 +41,39 @@ import { setFavicon } from '../lib/utils/common_utils';
...
@@ -41,10 +41,39 @@ import { setFavicon } from '../lib/utils/common_utils';
export
default
{
export
default
{
el
:
'
#js-vue-mr-widget
'
,
el
:
'
#js-vue-mr-widget
'
,
name
:
'
MRWidget
'
,
name
:
'
MRWidget
'
,
components
:
{
'
mr-widget-header
'
:
WidgetHeader
,
'
mr-widget-merge-help
'
:
WidgetMergeHelp
,
'
mr-widget-pipeline
'
:
WidgetPipeline
,
Deployment
,
'
mr-widget-related-links
'
:
WidgetRelatedLinks
,
'
mr-widget-merged
'
:
MergedState
,
'
mr-widget-closed
'
:
ClosedState
,
'
mr-widget-merging
'
:
MergingState
,
'
mr-widget-failed-to-merge
'
:
FailedToMerge
,
'
mr-widget-wip
'
:
WorkInProgressState
,
'
mr-widget-archived
'
:
ArchivedState
,
'
mr-widget-conflicts
'
:
ConflictsState
,
'
mr-widget-nothing-to-merge
'
:
NothingToMergeState
,
'
mr-widget-not-allowed
'
:
NotAllowedState
,
'
mr-widget-missing-branch
'
:
MissingBranchState
,
'
mr-widget-ready-to-merge
'
:
ReadyToMergeState
,
'
sha-mismatch
'
:
ShaMismatchState
,
'
mr-widget-squash-before-merge
'
:
SquashBeforeMerge
,
'
mr-widget-checking
'
:
CheckingState
,
'
mr-widget-unresolved-discussions
'
:
UnresolvedDiscussionsState
,
'
mr-widget-pipeline-blocked
'
:
PipelineBlockedState
,
'
mr-widget-pipeline-failed
'
:
PipelineFailedState
,
'
mr-widget-merge-when-pipeline-succeeds
'
:
MergeWhenPipelineSucceedsState
,
'
mr-widget-auto-merge-failed
'
:
AutoMergeFailed
,
'
mr-widget-rebase
'
:
RebaseState
,
SourceBranchRemovalStatus
,
},
props
:
{
props
:
{
mrData
:
{
mrData
:
{
type
:
Object
,
type
:
Object
,
required
:
false
,
required
:
false
,
default
:
()
=>
({}),
},
},
},
},
data
()
{
data
()
{
...
@@ -73,6 +102,13 @@ export default {
...
@@ -73,6 +102,13 @@ export default {
(
!
this
.
mr
.
isNothingToMergeState
&&
!
this
.
mr
.
isMergedState
);
(
!
this
.
mr
.
isNothingToMergeState
&&
!
this
.
mr
.
isMergedState
);
},
},
},
},
created
()
{
this
.
initPolling
();
this
.
bindEventHubListeners
();
},
mounted
()
{
this
.
handleMounted
();
},
methods
:
{
methods
:
{
createService
(
store
)
{
createService
(
store
)
{
const
endpoints
=
{
const
endpoints
=
{
...
@@ -203,41 +239,6 @@ export default {
...
@@ -203,41 +239,6 @@ export default {
this
.
initDeploymentsPolling
();
this
.
initDeploymentsPolling
();
},
},
},
},
created
()
{
this
.
initPolling
();
this
.
bindEventHubListeners
();
},
mounted
()
{
this
.
handleMounted
();
},
components
:
{
'
mr-widget-header
'
:
WidgetHeader
,
'
mr-widget-merge-help
'
:
WidgetMergeHelp
,
'
mr-widget-pipeline
'
:
WidgetPipeline
,
Deployment
,
'
mr-widget-related-links
'
:
WidgetRelatedLinks
,
'
mr-widget-merged
'
:
MergedState
,
'
mr-widget-closed
'
:
ClosedState
,
'
mr-widget-merging
'
:
MergingState
,
'
mr-widget-failed-to-merge
'
:
FailedToMerge
,
'
mr-widget-wip
'
:
WorkInProgressState
,
'
mr-widget-archived
'
:
ArchivedState
,
'
mr-widget-conflicts
'
:
ConflictsState
,
'
mr-widget-nothing-to-merge
'
:
NothingToMergeState
,
'
mr-widget-not-allowed
'
:
NotAllowedState
,
'
mr-widget-missing-branch
'
:
MissingBranchState
,
'
mr-widget-ready-to-merge
'
:
ReadyToMergeState
,
'
sha-mismatch
'
:
ShaMismatchState
,
'
mr-widget-squash-before-merge
'
:
SquashBeforeMerge
,
'
mr-widget-checking
'
:
CheckingState
,
'
mr-widget-unresolved-discussions
'
:
UnresolvedDiscussionsState
,
'
mr-widget-pipeline-blocked
'
:
PipelineBlockedState
,
'
mr-widget-pipeline-failed
'
:
PipelineFailedState
,
'
mr-widget-merge-when-pipeline-succeeds
'
:
MergeWhenPipelineSucceedsState
,
'
mr-widget-auto-merge-failed
'
:
AutoMergeFailed
,
'
mr-widget-rebase
'
:
RebaseState
,
SourceBranchRemovalStatus
,
},
};
};
</
script
>
</
script
>
<
template
>
<
template
>
...
@@ -287,4 +288,4 @@ export default {
...
@@ -287,4 +288,4 @@ export default {
<mr-widget-merge-help
/>
<mr-widget-merge-help
/>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
\ No newline at end of file
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