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
779c90d1
Commit
779c90d1
authored
Oct 31, 2018
by
Clement Ho
Committed by
Phil Hughes
Oct 31, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove gitlab-ui's modal from global
parent
8c57cb39
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
8 deletions
+18
-8
app/assets/javascripts/commons/gitlab_ui.js
app/assets/javascripts/commons/gitlab_ui.js
+0
-4
app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
...pts/pages/projects/wikis/components/delete_wiki_modal.vue
+9
-2
app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
...javascripts/set_status_modal/set_status_modal_wrapper.vue
+4
-2
changelogs/unreleased/gl-ui-modal.yml
changelogs/unreleased/gl-ui-modal.yml
+5
-0
No files found.
app/assets/javascripts/commons/gitlab_ui.js
View file @
779c90d1
...
@@ -2,16 +2,12 @@ import Vue from 'vue';
...
@@ -2,16 +2,12 @@ import Vue from 'vue';
import
{
import
{
GlPagination
,
GlPagination
,
GlProgressBar
,
GlProgressBar
,
GlModal
,
GlLoadingIcon
,
GlLoadingIcon
,
GlModalDirective
,
GlTooltipDirective
,
GlTooltipDirective
,
}
from
'
@gitlab-org/gitlab-ui
'
;
}
from
'
@gitlab-org/gitlab-ui
'
;
Vue
.
component
(
'
gl-pagination
'
,
GlPagination
);
Vue
.
component
(
'
gl-pagination
'
,
GlPagination
);
Vue
.
component
(
'
gl-progress-bar
'
,
GlProgressBar
);
Vue
.
component
(
'
gl-progress-bar
'
,
GlProgressBar
);
Vue
.
component
(
'
gl-ui-modal
'
,
GlModal
);
Vue
.
component
(
'
gl-loading-icon
'
,
GlLoadingIcon
);
Vue
.
component
(
'
gl-loading-icon
'
,
GlLoadingIcon
);
Vue
.
directive
(
'
gl-modal
'
,
GlModalDirective
);
Vue
.
directive
(
'
gl-tooltip
'
,
GlTooltipDirective
);
Vue
.
directive
(
'
gl-tooltip
'
,
GlTooltipDirective
);
app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue
View file @
779c90d1
<
script
>
<
script
>
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
{
s__
,
sprintf
}
from
'
~/locale
'
;
import
{
s__
,
sprintf
}
from
'
~/locale
'
;
import
{
GlModal
,
GlModalDirective
}
from
'
@gitlab-org/gitlab-ui
'
;
export
default
{
export
default
{
components
:
{
GlModal
,
},
directives
:
{
'
gl-modal
'
:
GlModalDirective
,
},
props
:
{
props
:
{
deleteWikiUrl
:
{
deleteWikiUrl
:
{
type
:
String
,
type
:
String
,
...
@@ -54,7 +61,7 @@ export default {
...
@@ -54,7 +61,7 @@ export default {
>
>
{{
__
(
'
Delete
'
)
}}
{{
__
(
'
Delete
'
)
}}
</button>
</button>
<gl-
ui-
modal
<gl-modal
:title=
"title"
:title=
"title"
:ok-title=
"s__('WikiPageConfirmDelete|Delete page')"
:ok-title=
"s__('WikiPageConfirmDelete|Delete page')"
:modal-id=
"modalId"
:modal-id=
"modalId"
...
@@ -81,6 +88,6 @@ export default {
...
@@ -81,6 +88,6 @@ export default {
name=
"authenticity_token"
name=
"authenticity_token"
/>
/>
</form>
</form>
</gl-
ui-
modal>
</gl-modal>
</div>
</div>
</
template
>
</
template
>
app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
View file @
779c90d1
...
@@ -5,6 +5,7 @@ import Icon from '~/vue_shared/components/icon.vue';
...
@@ -5,6 +5,7 @@ import Icon from '~/vue_shared/components/icon.vue';
import
GfmAutoComplete
from
'
~/gfm_auto_complete
'
;
import
GfmAutoComplete
from
'
~/gfm_auto_complete
'
;
import
{
__
,
s__
}
from
'
~/locale
'
;
import
{
__
,
s__
}
from
'
~/locale
'
;
import
Api
from
'
~/api
'
;
import
Api
from
'
~/api
'
;
import
{
GlModal
}
from
'
@gitlab-org/gitlab-ui
'
;
import
eventHub
from
'
./event_hub
'
;
import
eventHub
from
'
./event_hub
'
;
import
EmojiMenuInModal
from
'
./emoji_menu_in_modal
'
;
import
EmojiMenuInModal
from
'
./emoji_menu_in_modal
'
;
...
@@ -13,6 +14,7 @@ const emojiMenuClass = 'js-modal-status-emoji-menu';
...
@@ -13,6 +14,7 @@ const emojiMenuClass = 'js-modal-status-emoji-menu';
export
default
{
export
default
{
components
:
{
components
:
{
Icon
,
Icon
,
GlModal
,
},
},
props
:
{
props
:
{
currentEmoji
:
{
currentEmoji
:
{
...
@@ -152,7 +154,7 @@ export default {
...
@@ -152,7 +154,7 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<gl-
ui-
modal
<gl-modal
:title=
"s__('SetStatusModal|Set a status')"
:title=
"s__('SetStatusModal|Set a status')"
:modal-id=
"modalId"
:modal-id=
"modalId"
:ok-title=
"s__('SetStatusModal|Set status')"
:ok-title=
"s__('SetStatusModal|Set status')"
...
@@ -237,5 +239,5 @@ export default {
...
@@ -237,5 +239,5 @@ export default {
</div>
</div>
</div>
</div>
</div>
</div>
</gl-
ui-
modal>
</gl-modal>
</
template
>
</
template
>
changelogs/unreleased/gl-ui-modal.yml
0 → 100644
View file @
779c90d1
---
title
:
Remove gitlab-ui's modal from global
merge_request
:
author
:
type
:
performance
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