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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
7f22c39a
Commit
7f22c39a
authored
Mar 01, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
create a cacheable commons bundle for our Vue bundles
parent
14517f97
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
28 additions
and
5 deletions
+28
-5
app/assets/javascripts/lib/vue_resource.js.es6
app/assets/javascripts/lib/vue_resource.js.es6
+0
-2
app/views/projects/boards/_show.html.haml
app/views/projects/boards/_show.html.haml
+1
-0
app/views/projects/commit/_pipelines_list.haml
app/views/projects/commit/_pipelines_list.haml
+1
-0
app/views/projects/cycle_analytics/show.html.haml
app/views/projects/cycle_analytics/show.html.haml
+1
-0
app/views/projects/environments/folder.html.haml
app/views/projects/environments/folder.html.haml
+1
-0
app/views/projects/environments/index.html.haml
app/views/projects/environments/index.html.haml
+1
-0
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-0
app/views/projects/merge_requests/conflicts.html.haml
app/views/projects/merge_requests/conflicts.html.haml
+1
-1
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+1
-0
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-0
config/webpack.config.js
config/webpack.config.js
+18
-1
No files found.
app/assets/javascripts/lib/vue_resource.js.es6
deleted
100644 → 0
View file @
14517f97
window.Vue = require('vue');
window.Vue.use(require('vue-resource'));
app/views/projects/boards/_show.html.haml
View file @
7f22c39a
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
-
page_title
"Boards"
-
page_title
"Boards"
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'common_vue'
)
=
page_specific_javascript_bundle_tag
(
'boards'
)
=
page_specific_javascript_bundle_tag
(
'boards'
)
=
page_specific_javascript_bundle_tag
(
'simulate_drag'
)
if
Rails
.
env
.
test?
=
page_specific_javascript_bundle_tag
(
'simulate_drag'
)
if
Rails
.
env
.
test?
...
...
app/views/projects/commit/_pipelines_list.haml
View file @
7f22c39a
...
@@ -4,4 +4,5 @@
...
@@ -4,4 +4,5 @@
}
}
}
}
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'common_vue'
)
=
page_specific_javascript_bundle_tag
(
'commit_pipelines'
)
=
page_specific_javascript_bundle_tag
(
'commit_pipelines'
)
app/views/projects/cycle_analytics/show.html.haml
View file @
7f22c39a
-
@no_container
=
true
-
@no_container
=
true
-
page_title
"Cycle Analytics"
-
page_title
"Cycle Analytics"
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'common_vue'
)
=
page_specific_javascript_bundle_tag
(
'cycle_analytics'
)
=
page_specific_javascript_bundle_tag
(
'cycle_analytics'
)
=
render
"projects/head"
=
render
"projects/head"
...
...
app/views/projects/environments/folder.html.haml
View file @
7f22c39a
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
=
render
"projects/pipelines/head"
=
render
"projects/pipelines/head"
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'common_vue'
)
=
page_specific_javascript_bundle_tag
(
"environments_folder"
)
=
page_specific_javascript_bundle_tag
(
"environments_folder"
)
#environments-folder-list-view
{
data:
{
"can-create-deployment"
=>
can?
(
current_user
,
:create_deployment
,
@project
).
to_s
,
#environments-folder-list-view
{
data:
{
"can-create-deployment"
=>
can?
(
current_user
,
:create_deployment
,
@project
).
to_s
,
...
...
app/views/projects/environments/index.html.haml
View file @
7f22c39a
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
=
render
"projects/pipelines/head"
=
render
"projects/pipelines/head"
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'common_vue'
)
=
page_specific_javascript_bundle_tag
(
"environments"
)
=
page_specific_javascript_bundle_tag
(
"environments"
)
#environments-list-view
{
data:
{
environments_data:
environments_list_data
,
#environments-list-view
{
data:
{
environments_data:
environments_list_data
,
...
...
app/views/projects/issues/show.html.haml
View file @
7f22c39a
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
-
page_description
@issue
.
description
-
page_description
@issue
.
description
-
page_card_attributes
@issue
.
card_attributes
-
page_card_attributes
@issue
.
card_attributes
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'
lib
_vue'
)
=
page_specific_javascript_bundle_tag
(
'
common
_vue'
)
.clearfix.detail-page-header
.clearfix.detail-page-header
.issuable-header
.issuable-header
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
7f22c39a
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
-
page_description
@merge_request
.
description
-
page_description
@merge_request
.
description
-
page_card_attributes
@merge_request
.
card_attributes
-
page_card_attributes
@merge_request
.
card_attributes
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'common_vue'
)
=
page_specific_javascript_bundle_tag
(
'diff_notes'
)
=
page_specific_javascript_bundle_tag
(
'diff_notes'
)
.merge-request
{
'data-url'
=>
merge_request_path
(
@merge_request
),
'data-project-path'
=>
project_path
(
@merge_request
.
project
)
}
.merge-request
{
'data-url'
=>
merge_request_path
(
@merge_request
),
'data-project-path'
=>
project_path
(
@merge_request
.
project
)
}
...
...
app/views/projects/merge_requests/conflicts.html.haml
View file @
7f22c39a
-
page_title
"Merge Conflicts"
,
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
"
,
"Merge Requests"
-
page_title
"Merge Conflicts"
,
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
"
,
"Merge Requests"
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'
lib
_vue'
)
=
page_specific_javascript_bundle_tag
(
'
common
_vue'
)
=
page_specific_javascript_bundle_tag
(
'merge_conflicts'
)
=
page_specific_javascript_bundle_tag
(
'merge_conflicts'
)
=
page_specific_javascript_tag
(
'lib/ace.js'
)
=
page_specific_javascript_tag
(
'lib/ace.js'
)
=
render
"projects/merge_requests/show/mr_title"
=
render
"projects/merge_requests/show/mr_title"
...
...
app/views/projects/pipelines/index.html.haml
View file @
7f22c39a
...
@@ -50,4 +50,5 @@
...
@@ -50,4 +50,5 @@
.content-list.pipelines
{
data:
{
url:
namespace_project_pipelines_path
(
@project
.
namespace
,
@project
,
format: :json
)
}
}
.content-list.pipelines
{
data:
{
url:
namespace_project_pipelines_path
(
@project
.
namespace
,
@project
,
format: :json
)
}
}
.vue-pipelines-index
.vue-pipelines-index
=
page_specific_javascript_bundle_tag
(
'common_vue'
)
=
page_specific_javascript_bundle_tag
(
'vue_pipelines'
)
=
page_specific_javascript_bundle_tag
(
'vue_pipelines'
)
app/views/shared/issuable/_sidebar.html.haml
View file @
7f22c39a
-
todo
=
issuable_todo
(
issuable
)
-
todo
=
issuable_todo
(
issuable
)
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'common_vue'
)
=
page_specific_javascript_bundle_tag
(
'issuable'
)
=
page_specific_javascript_bundle_tag
(
'issuable'
)
%aside
.right-sidebar.js-right-sidebar
{
data:
{
"offset-top"
=>
"101"
,
"spy"
=>
"affix"
},
class:
sidebar_gutter_collapsed_class
,
'aria-live'
=>
'polite'
}
%aside
.right-sidebar.js-right-sidebar
{
data:
{
"offset-top"
=>
"101"
,
"spy"
=>
"affix"
},
class:
sidebar_gutter_collapsed_class
,
'aria-live'
=>
'polite'
}
...
...
config/webpack.config.js
View file @
7f22c39a
...
@@ -18,6 +18,7 @@ var config = {
...
@@ -18,6 +18,7 @@ var config = {
context
:
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts
'
),
context
:
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts
'
),
entry
:
{
entry
:
{
common
:
'
./commons/index.js
'
,
common
:
'
./commons/index.js
'
,
common_vue
:
[
'
vue
'
,
'
vue-resource
'
],
application
:
'
./application.js
'
,
application
:
'
./application.js
'
,
blob_edit
:
'
./blob_edit/blob_edit_bundle.js
'
,
blob_edit
:
'
./blob_edit/blob_edit_bundle.js
'
,
boards
:
'
./boards/boards_bundle.js
'
,
boards
:
'
./boards/boards_bundle.js
'
,
...
@@ -41,7 +42,6 @@ var config = {
...
@@ -41,7 +42,6 @@ var config = {
users
:
'
./users/users_bundle.js
'
,
users
:
'
./users/users_bundle.js
'
,
lib_chart
:
'
./lib/chart.js
'
,
lib_chart
:
'
./lib/chart.js
'
,
lib_d3
:
'
./lib/d3.js
'
,
lib_d3
:
'
./lib/d3.js
'
,
lib_vue
:
'
./lib/vue_resource.js
'
,
vue_pipelines
:
'
./vue_pipelines_index/index.js
'
,
vue_pipelines
:
'
./vue_pipelines_index/index.js
'
,
},
},
...
@@ -98,6 +98,23 @@ var config = {
...
@@ -98,6 +98,23 @@ var config = {
new
webpack
.
HashedModuleIdsPlugin
()
:
new
webpack
.
HashedModuleIdsPlugin
()
:
new
webpack
.
NamedModulesPlugin
(),
new
webpack
.
NamedModulesPlugin
(),
// create cacheable common library bundle for all vue chunks
new
webpack
.
optimize
.
CommonsChunkPlugin
({
name
:
'
common_vue
'
,
chunks
:
[
'
boards
'
,
'
commit_pipelines
'
,
'
cycle_analytics
'
,
'
diff_notes
'
,
'
environments
'
,
'
environments_folder
'
,
'
issuable
'
,
'
merge_conflicts
'
,
'
vue_pipelines
'
,
],
minChunks
:
Infinity
,
}),
// create cacheable common library bundles
// create cacheable common library bundles
new
webpack
.
optimize
.
CommonsChunkPlugin
({
new
webpack
.
optimize
.
CommonsChunkPlugin
({
names
:
[
'
application
'
,
'
common
'
,
'
manifest
'
],
names
:
[
'
application
'
,
'
common
'
,
'
manifest
'
],
...
...
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