summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorConstance Okoghenun <cokoghenun@gitlab.com>2018-02-15 13:12:47 +0100
committerConstance Okoghenun <cokoghenun@gitlab.com>2018-02-15 13:12:47 +0100
commitc16e6d591f8c270368a3faff7475c8dfdf4695d0 (patch)
treed84361843d91240f9382eb6279e8749599a4cd06 /app
parent6444eca2be63cdc11090b2634aaa3648b1079ca8 (diff)
downloadgitlab-ce-c16e6d591f8c270368a3faff7475c8dfdf4695d0.tar.gz
Removed integrations webpack bundle tagproject-integrations-form-dispatcher-refactor
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/dispatcher.js5
-rw-r--r--app/assets/javascripts/pages/projects/services/edit/index.js (renamed from app/assets/javascripts/integrations/index.js)7
-rw-r--r--app/views/projects/services/_form.html.haml3
3 files changed, 8 insertions, 7 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index f8082c74943..e4288dc1317 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -224,6 +224,11 @@ var Dispatcher;
.then(callDefault)
.catch(fail);
break;
+ case 'projects:services:edit':
+ import('./pages/projects/services/edit')
+ .then(callDefault)
+ .catch(fail);
+ break;
case 'projects:snippets:edit':
case 'projects:snippets:update':
import('./pages/projects/snippets/edit')
diff --git a/app/assets/javascripts/integrations/index.js b/app/assets/javascripts/pages/projects/services/edit/index.js
index 10fe6bac0e8..434a7e44277 100644
--- a/app/assets/javascripts/integrations/index.js
+++ b/app/assets/javascripts/pages/projects/services/edit/index.js
@@ -1,7 +1,6 @@
-/* eslint-disable no-new */
-import IntegrationSettingsForm from './integration_settings_form';
+import IntegrationSettingsForm from '~/integrations/integration_settings_form';
-$(() => {
+export default () => {
const integrationSettingsForm = new IntegrationSettingsForm('.js-integration-settings-form');
integrationSettingsForm.init();
-});
+};
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index 0808b28a9df..17e804d682b 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -1,6 +1,3 @@
-- content_for :page_specific_javascripts do
- = webpack_bundle_tag('integrations')
-
.row.prepend-top-default.append-bottom-default
.col-lg-3
%h4.prepend-top-0