diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-02-15 18:23:16 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-02-15 18:23:16 +0000 |
| commit | efdde042a3299668957d16200a407b9daae52301 (patch) | |
| tree | 1104c19f51ad3c2fcdc83c3c6fbcee3736b4c7ef | |
| parent | 9d0b54d4c2d8aa913cad876cf399eedbbe6fceed (diff) | |
| parent | c16e6d591f8c270368a3faff7475c8dfdf4695d0 (diff) | |
| download | gitlab-ce-efdde042a3299668957d16200a407b9daae52301.tar.gz | |
Merge branch 'project-integrations-form-dispatcher-refactor' into 'master'
Removed integrations webpack bundle tag
See merge request gitlab-org/gitlab-ce!17147
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 5 | ||||
| -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.haml | 3 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
4 files changed, 8 insertions, 8 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 diff --git a/config/webpack.config.js b/config/webpack.config.js index 49653b61181..3fff808f166 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -68,7 +68,6 @@ var config = { help: './help/help.js', how_to_merge: './how_to_merge.js', issue_show: './issue_show/index.js', - integrations: './integrations', job_details: './jobs/job_details_bundle.js', locale: './locale/index.js', main: './main.js', |