Merge branch 'project-integrations-form-dispatcher-refactor' into 'master'
Removed integrations webpack bundle tag See merge request gitlab-org/gitlab-ce!17147
This commit is contained in:
commit
efdde042a3
|
@ -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')
|
||||
|
|
|
@ -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();
|
||||
});
|
||||
};
|
|
@ -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
|
||||
|
|
|
@ -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',
|
||||
|
|
Loading…
Reference in New Issue