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
5ba7a2eb
Commit
5ba7a2eb
authored
Nov 24, 2020
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved vue-toasted into status modal
parent
6ff76f6a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
app/assets/javascripts/header.js
app/assets/javascripts/header.js
+0
-2
app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
...javascripts/set_status_modal/set_status_modal_wrapper.vue
+4
-1
No files found.
app/assets/javascripts/header.js
View file @
5ba7a2eb
import
$
from
'
jquery
'
;
import
Vue
from
'
vue
'
;
import
{
GlToast
}
from
'
@gitlab/ui
'
;
import
Translate
from
'
~/vue_shared/translate
'
;
import
{
highCountTrim
}
from
'
~/lib/utils/text_utility
'
;
import
Tracking
from
'
~/tracking
'
;
...
...
@@ -35,7 +34,6 @@ function initStatusTriggers() {
const
statusModalElement
=
document
.
createElement
(
'
div
'
);
setStatusModalWrapperEl
.
appendChild
(
statusModalElement
);
Vue
.
use
(
GlToast
);
Vue
.
use
(
Translate
);
// eslint-disable-next-line no-new
...
...
app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue
View file @
5ba7a2eb
<
script
>
/* eslint-disable vue/no-v-html */
import
$
from
'
jquery
'
;
import
Vue
from
'
vue
'
;
import
GfmAutoComplete
from
'
ee_else_ce/gfm_auto_complete
'
;
import
{
GlModal
,
GlTooltipDirective
,
GlIcon
,
GlFormCheckbox
}
from
'
@gitlab/ui
'
;
import
{
Gl
Toast
,
Gl
Modal
,
GlTooltipDirective
,
GlIcon
,
GlFormCheckbox
}
from
'
@gitlab/ui
'
;
import
{
deprecatedCreateFlash
as
createFlash
}
from
'
~/flash
'
;
import
{
__
,
s__
}
from
'
~/locale
'
;
import
Api
from
'
~/api
'
;
...
...
@@ -16,6 +17,8 @@ export const AVAILABILITY_STATUS = {
NOT_SET
:
'
not_set
'
,
};
Vue
.
use
(
GlToast
);
export
default
{
components
:
{
GlIcon
,
...
...
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