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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
c16e6d59
Commit
c16e6d59
authored
Feb 15, 2018
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed integrations webpack bundle tag
parent
6444eca2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+5
-0
app/assets/javascripts/pages/projects/services/edit/index.js
app/assets/javascripts/pages/projects/services/edit/index.js
+3
-4
app/views/projects/services/_form.html.haml
app/views/projects/services/_form.html.haml
+0
-3
config/webpack.config.js
config/webpack.config.js
+0
-1
No files found.
app/assets/javascripts/dispatcher.js
View file @
c16e6d59
...
@@ -224,6 +224,11 @@ var Dispatcher;
...
@@ -224,6 +224,11 @@ var Dispatcher;
.
then
(
callDefault
)
.
then
(
callDefault
)
.
catch
(
fail
);
.
catch
(
fail
);
break
;
break
;
case
'
projects:services:edit
'
:
import
(
'
./pages/projects/services/edit
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'
projects:snippets:edit
'
:
case
'
projects:snippets:edit
'
:
case
'
projects:snippets:update
'
:
case
'
projects:snippets:update
'
:
import
(
'
./pages/projects/snippets/edit
'
)
import
(
'
./pages/projects/snippets/edit
'
)
...
...
app/assets/javascripts/
integrations
/index.js
→
app/assets/javascripts/
pages/projects/services/edit
/index.js
View file @
c16e6d59
/* eslint-disable no-new */
import
IntegrationSettingsForm
from
'
~/integrations/integration_settings_form
'
;
import
IntegrationSettingsForm
from
'
./integration_settings_form
'
;
$
(
()
=>
{
export
default
()
=>
{
const
integrationSettingsForm
=
new
IntegrationSettingsForm
(
'
.js-integration-settings-form
'
);
const
integrationSettingsForm
=
new
IntegrationSettingsForm
(
'
.js-integration-settings-form
'
);
integrationSettingsForm
.
init
();
integrationSettingsForm
.
init
();
}
)
;
};
app/views/projects/services/_form.html.haml
View file @
c16e6d59
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'integrations'
)
.row.prepend-top-default.append-bottom-default
.row.prepend-top-default.append-bottom-default
.col-lg-3
.col-lg-3
%h4
.prepend-top-0
%h4
.prepend-top-0
...
...
config/webpack.config.js
View file @
c16e6d59
...
@@ -68,7 +68,6 @@ var config = {
...
@@ -68,7 +68,6 @@ var config = {
help
:
'
./help/help.js
'
,
help
:
'
./help/help.js
'
,
how_to_merge
:
'
./how_to_merge.js
'
,
how_to_merge
:
'
./how_to_merge.js
'
,
issue_show
:
'
./issue_show/index.js
'
,
issue_show
:
'
./issue_show/index.js
'
,
integrations
:
'
./integrations
'
,
job_details
:
'
./jobs/job_details_bundle.js
'
,
job_details
:
'
./jobs/job_details_bundle.js
'
,
locale
:
'
./locale/index.js
'
,
locale
:
'
./locale/index.js
'
,
main
:
'
./main.js
'
,
main
:
'
./main.js
'
,
...
...
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