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
02c7f82a
Commit
02c7f82a
authored
Mar 06, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move NothingToMerge vue component
parent
96a3847e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
56 additions
and
48 deletions
+56
-48
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge.js
...st_widget/components/states/mr_widget_nothing_to_merge.js
+0
-44
app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
...rge_request_widget/components/states/nothing_to_merge.vue
+47
-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-nothing-to-merge-vue-component.yml
...efactor-move-mr-widget-nothing-to-merge-vue-component.yml
+5
-0
spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js
...dget/components/states/mr_widget_nothing_to_merge_spec.js
+3
-3
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_nothing_to_merge.js
deleted
100644 → 0
View file @
96a3847e
import
emptyStateSVG
from
'
icons/_mr_widget_empty_state.svg
'
;
export
default
{
name
:
'
MRWidgetNothingToMerge
'
,
props
:
{
mr
:
{
type
:
Object
,
required
:
true
,
},
},
data
()
{
return
{
emptyStateSVG
};
},
template
:
`
<div class="mr-widget-body mr-widget-empty-state">
<div class="row">
<div class="artwork col-sm-5 col-sm-push-7 col-xs-12 text-center">
<span v-html="emptyStateSVG"></span>
</div>
<div class="text col-sm-7 col-sm-pull-5 col-xs-12">
<span>
Merge requests are a place to propose changes you have made to a project
and discuss those changes with others.
</span>
<p>
Interested parties can even contribute by pushing commits if they want to.
</p>
<p>
Currently there are no changes in this merge request's source branch.
Please push new commits or use a different branch.
</p>
<div>
<a
v-if="mr.newBlobPath"
:href="mr.newBlobPath"
class="btn btn-inverted btn-save">
Create file
</a>
</div>
</div>
</div>
</div>
`
,
};
app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
0 → 100644
View file @
02c7f82a
<
script
>
import
emptyStateSVG
from
'
icons/_mr_widget_empty_state.svg
'
;
export
default
{
name
:
'
MRWidgetNothingToMerge
'
,
props
:
{
mr
:
{
type
:
Object
,
required
:
true
,
},
},
data
()
{
return
{
emptyStateSVG
};
},
};
</
script
>
<
template
>
<div
class=
"mr-widget-body mr-widget-empty-state"
>
<div
class=
"row"
>
<div
class=
"artwork col-sm-5 col-sm-push-7 col-xs-12 text-center"
>
<span
v-html=
"emptyStateSVG"
></span>
</div>
<div
class=
"text col-sm-7 col-sm-pull-5 col-xs-12"
>
<span>
Merge requests are a place to propose changes you have made to a project
and discuss those changes with others.
</span>
<p>
Interested parties can even contribute by pushing commits if they want to.
</p>
<p>
Currently there are no changes in this merge request's source branch.
Please push new commits or use a different branch.
</p>
<div>
<a
v-if=
"mr.newBlobPath"
:href=
"mr.newBlobPath"
class=
"btn btn-inverted btn-save"
>
Create file
</a>
</div>
</div>
</div>
</div>
</
template
>
app/assets/javascripts/vue_merge_request_widget/dependencies.js
View file @
02c7f82a
...
@@ -24,7 +24,7 @@ export { default as MergingState } from './components/states/mr_widget_merging.v
...
@@ -24,7 +24,7 @@ export { default as MergingState } from './components/states/mr_widget_merging.v
export
{
default
as
WipState
}
from
'
./components/states/mr_widget_wip
'
;
export
{
default
as
WipState
}
from
'
./components/states/mr_widget_wip
'
;
export
{
default
as
ArchivedState
}
from
'
./components/states/mr_widget_archived.vue
'
;
export
{
default
as
ArchivedState
}
from
'
./components/states/mr_widget_archived.vue
'
;
export
{
default
as
ConflictsState
}
from
'
./components/states/mr_widget_conflicts.vue
'
;
export
{
default
as
ConflictsState
}
from
'
./components/states/mr_widget_conflicts.vue
'
;
export
{
default
as
NothingToMergeState
}
from
'
./components/states/
mr_widget_nothing_to_merg
e
'
;
export
{
default
as
NothingToMergeState
}
from
'
./components/states/
nothing_to_merge.vu
e
'
;
export
{
default
as
MissingBranchState
}
from
'
./components/states/mr_widget_missing_branch.vue
'
;
export
{
default
as
MissingBranchState
}
from
'
./components/states/mr_widget_missing_branch.vue
'
;
export
{
default
as
NotAllowedState
}
from
'
./components/states/mr_widget_not_allowed.vue
'
;
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
ReadyToMergeState
}
from
'
./components/states/mr_widget_ready_to_merge
'
;
...
...
changelogs/unreleased/refactor-move-mr-widget-nothing-to-merge-vue-component.yml
0 → 100644
View file @
02c7f82a
---
title
:
Move NothingToMerge vue component
merge_request
:
17544
author
:
George Tsiolis
type
:
performance
spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js
View file @
02c7f82a
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
nothingToMergeComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_nothing_to_merg
e
'
;
import
NothingToMerge
from
'
~/vue_merge_request_widget/components/states/nothing_to_merge.vu
e
'
;
describe
(
'
MRWidget
NothingToMerge
'
,
()
=>
{
describe
(
'
NothingToMerge
'
,
()
=>
{
describe
(
'
template
'
,
()
=>
{
describe
(
'
template
'
,
()
=>
{
const
Component
=
Vue
.
extend
(
nothingToMergeComponent
);
const
Component
=
Vue
.
extend
(
NothingToMerge
);
const
newBlobPath
=
'
/foo
'
;
const
newBlobPath
=
'
/foo
'
;
const
vm
=
new
Component
({
const
vm
=
new
Component
({
el
:
document
.
createElement
(
'
div
'
),
el
:
document
.
createElement
(
'
div
'
),
...
...
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