BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
891d1302
Commit
891d1302
authored
Feb 28, 2018
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'enviroments-webpack-bundle-refactor' into 'master'
Remove webpack bundle tag for enviroments See merge request gitlab-org/gitlab-ce!17371
parents
e2638c3f
aae4d8b0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
index.js
app/assets/javascripts/environments/index.js
+2
-2
index.js
app/assets/javascripts/pages/projects/environments/index.js
+3
-0
index.html.haml
app/views/projects/environments/index.html.haml
+0
-1
webpack.config.js
config/webpack.config.js
+0
-1
No files found.
app/assets/javascripts/environments/
environments_bundle
.js
→
app/assets/javascripts/environments/
index
.js
View file @
891d1302
...
...
@@ -5,7 +5,7 @@ import Translate from '../vue_shared/translate';
Vue
.
use
(
Translate
);
document
.
addEventListener
(
'DOMContentLoaded'
,
()
=>
new
Vue
({
export
default
()
=>
new
Vue
({
el
:
'#environments-list-view'
,
components
:
{
environmentsComponent
,
...
...
@@ -36,4 +36,4 @@ document.addEventListener('DOMContentLoaded', () => new Vue({
},
});
},
})
)
;
});
app/assets/javascripts/pages/projects/environments/index.js
0 → 100644
View file @
891d1302
import
initEnviroments
from
'~/environments/'
;
document
.
addEventListener
(
'DOMContentLoaded'
,
initEnviroments
);
app/views/projects/environments/index.html.haml
View file @
891d1302
...
...
@@ -4,7 +4,6 @@
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
"common_vue"
)
=
webpack_bundle_tag
(
"environments"
)
#environments-list-view
{
data:
{
environments_data:
environments_list_data
,
"can-create-deployment"
=>
can?
(
current_user
,
:create_deployment
,
@project
).
to_s
,
...
...
config/webpack.config.js
View file @
891d1302
...
...
@@ -44,7 +44,6 @@ function generateEntries() {
const
manualEntries
=
{
balsamiq_viewer
:
'./blob/balsamiq_viewer.js'
,
environments
:
'./environments/environments_bundle.js'
,
monitoring
:
'./monitoring/monitoring_bundle.js'
,
mr_notes
:
'./mr_notes/index.js'
,
notebook_viewer
:
'./blob/notebook_viewer.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