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
8d1e704f
Commit
8d1e704f
authored
Mar 05, 2018
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed service_desk webpack bundle tag
parent
c8960cd9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+0
-1
config/webpack.config.js
config/webpack.config.js
+0
-1
ee/app/assets/javascripts/pages/projects/edit/index.js
ee/app/assets/javascripts/pages/projects/edit/index.js
+2
-0
ee/app/assets/javascripts/projects/settings_service_desk/index.js
...ssets/javascripts/projects/settings_service_desk/index.js
+2
-2
No files found.
app/views/projects/edit.html.haml
View file @
8d1e704f
...
...
@@ -5,7 +5,6 @@
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'common_vue'
)
=
webpack_bundle_tag
(
'service_desk'
)
.project-edit-container
%section
.settings.general-settings.no-animate
{
class:
(
'expanded'
if
expanded
)
}
...
...
config/webpack.config.js
View file @
8d1e704f
...
...
@@ -58,7 +58,6 @@ function generateEntries() {
// EE-only
ide
:
'
ee/ide/index.js
'
,
geo_nodes
:
'
ee/geo_nodes
'
,
service_desk
:
'
ee/projects/settings_service_desk/service_desk_bundle.js
'
,
};
return
Object
.
assign
(
manualEntries
,
autoEntries
);
...
...
ee/app/assets/javascripts/pages/projects/edit/index.js
View file @
8d1e704f
...
...
@@ -4,6 +4,7 @@ import UsersSelect from '~/users_select';
import
UserCallout
from
'
~/user_callout
'
;
import
groupsSelect
from
'
~/groups_select
'
;
import
ApproversSelect
from
'
ee/approvers_select
'
;
import
initServiceDesk
from
'
ee/projects/settings_service_desk
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
UsersSelect
();
...
...
@@ -12,4 +13,5 @@ document.addEventListener('DOMContentLoaded', () => {
new
UserCallout
({
className
:
'
js-service-desk-callout
'
});
new
UserCallout
({
className
:
'
js-mr-approval-callout
'
});
new
ApproversSelect
();
initServiceDesk
();
});
ee/app/assets/javascripts/projects/settings_service_desk/
service_desk_bundle
.js
→
ee/app/assets/javascripts/projects/settings_service_desk/
index
.js
View file @
8d1e704f
...
...
@@ -2,7 +2,7 @@ import Vue from 'vue';
import
{
convertPermissionToBoolean
}
from
'
~/lib/utils/common_utils
'
;
import
serviceDeskRoot
from
'
./components/service_desk_root.vue
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
export
default
()
=>
{
const
serviceDeskRootElement
=
document
.
querySelector
(
'
.js-service-desk-setting-root
'
);
if
(
serviceDeskRootElement
)
{
// eslint-disable-next-line no-new
...
...
@@ -32,4 +32,4 @@ document.addEventListener('DOMContentLoaded', () => {
},
});
}
}
)
;
};
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