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
6358004b
Commit
6358004b
authored
Feb 26, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Converted webpack_bundle_tag to be automatic webpack bundles
parent
78ed5c0f
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
25 additions
and
34 deletions
+25
-34
app/assets/javascripts/network/network_bundle.js
app/assets/javascripts/network/network_bundle.js
+0
-17
app/assets/javascripts/pages/projects/merge_requests/show/index.js
...s/javascripts/pages/projects/merge_requests/show/index.js
+2
-0
app/assets/javascripts/pages/projects/network/network.js
app/assets/javascripts/pages/projects/network/network.js
+1
-1
app/assets/javascripts/pages/projects/network/show/index.js
app/assets/javascripts/pages/projects/network/show/index.js
+16
-0
app/assets/javascripts/pages/projects/pipelines/index/index.js
...ssets/javascripts/pages/projects/pipelines/index/index.js
+3
-3
app/assets/javascripts/pipelines/services/pipelines_service.js
...ssets/javascripts/pipelines/services/pipelines_service.js
+1
-0
app/assets/javascripts/vue_merge_request_widget/index.js
app/assets/javascripts/vue_merge_request_widget/index.js
+2
-2
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+0
-3
app/views/projects/network/show.html.haml
app/views/projects/network/show.html.haml
+0
-2
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+0
-3
config/webpack.config.js
config/webpack.config.js
+0
-3
No files found.
app/assets/javascripts/network/network_bundle.js
deleted
100644 → 0
View file @
78ed5c0f
/* eslint-disable func-names, space-before-function-paren, prefer-arrow-callback, quotes, no-var, vars-on-top, camelcase, comma-dangle, consistent-return, max-len */
import
ShortcutsNetwork
from
'
../shortcuts_network
'
;
import
Network
from
'
./network
'
;
$
(
function
()
{
if
(
!
$
(
"
.network-graph
"
).
length
)
return
;
var
network_graph
;
network_graph
=
new
Network
({
url
:
$
(
"
.network-graph
"
).
attr
(
'
data-url
'
),
commit_url
:
$
(
"
.network-graph
"
).
attr
(
'
data-commit-url
'
),
ref
:
$
(
"
.network-graph
"
).
attr
(
'
data-ref
'
),
commit_id
:
$
(
"
.network-graph
"
).
attr
(
'
data-commit-id
'
)
});
return
new
ShortcutsNetwork
(
network_graph
.
branch_graph
);
});
app/assets/javascripts/pages/projects/merge_requests/show/index.js
View file @
6358004b
...
@@ -7,6 +7,7 @@ import ShortcutsIssuable from '~/shortcuts_issuable';
...
@@ -7,6 +7,7 @@ import ShortcutsIssuable from '~/shortcuts_issuable';
import
Diff
from
'
~/diff
'
;
import
Diff
from
'
~/diff
'
;
import
{
handleLocationHash
}
from
'
~/lib/utils/common_utils
'
;
import
{
handleLocationHash
}
from
'
~/lib/utils/common_utils
'
;
import
howToMerge
from
'
~/how_to_merge
'
;
import
howToMerge
from
'
~/how_to_merge
'
;
import
initWidget
from
'
../../../../vue_merge_request_widget
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
Diff
();
// eslint-disable-line no-new
new
Diff
();
// eslint-disable-line no-new
...
@@ -25,4 +26,5 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -25,4 +26,5 @@ document.addEventListener('DOMContentLoaded', () => {
new
ShortcutsIssuable
(
true
);
// eslint-disable-line no-new
new
ShortcutsIssuable
(
true
);
// eslint-disable-line no-new
handleLocationHash
();
handleLocationHash
();
howToMerge
();
howToMerge
();
initWidget
();
});
});
app/assets/javascripts/network/network.js
→
app/assets/javascripts/
pages/projects/
network/network.js
View file @
6358004b
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, quotes, quote-props, prefer-template, comma-dangle, max-len */
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, quotes, quote-props, prefer-template, comma-dangle, max-len */
import
BranchGraph
from
'
./branch_graph
'
;
import
BranchGraph
from
'
.
./../../network
/branch_graph
'
;
export
default
(
function
()
{
export
default
(
function
()
{
function
Network
(
opts
)
{
function
Network
(
opts
)
{
...
...
app/assets/javascripts/pages/projects/network/show/index.js
0 → 100644
View file @
6358004b
import
ShortcutsNetwork
from
'
../../../../shortcuts_network
'
;
import
Network
from
'
../network
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
if
(
!
$
(
'
.network-graph
'
).
length
)
return
;
const
networkGraph
=
new
Network
({
url
:
$
(
'
.network-graph
'
).
attr
(
'
data-url
'
),
commit_url
:
$
(
'
.network-graph
'
).
attr
(
'
data-commit-url
'
),
ref
:
$
(
'
.network-graph
'
).
attr
(
'
data-ref
'
),
commit_id
:
$
(
'
.network-graph
'
).
attr
(
'
data-commit-id
'
),
});
// eslint-disable-next-line no-new
new
ShortcutsNetwork
(
networkGraph
.
branch_graph
);
});
app/assets/javascripts/p
ipelines/pipelines_bundle
.js
→
app/assets/javascripts/p
ages/projects/pipelines/index/index
.js
View file @
6358004b
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
PipelinesStore
from
'
./stores/pipelines_store
'
;
import
PipelinesStore
from
'
.
./../../../pipelines
/stores/pipelines_store
'
;
import
pipelinesComponent
from
'
./components/pipelines.vue
'
;
import
pipelinesComponent
from
'
.
./../../../pipelines
/components/pipelines.vue
'
;
import
Translate
from
'
../vue_shared/translate
'
;
import
Translate
from
'
../
../../../
vue_shared/translate
'
;
Vue
.
use
(
Translate
);
Vue
.
use
(
Translate
);
...
...
app/assets/javascripts/pipelines/services/pipelines_service.js
View file @
6358004b
/* eslint-disable class-methods-use-this */
/* eslint-disable class-methods-use-this */
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
VueResource
from
'
vue-resource
'
;
import
VueResource
from
'
vue-resource
'
;
import
'
../../vue_shared/vue_resource_interceptor
'
;
Vue
.
use
(
VueResource
);
Vue
.
use
(
VueResource
);
...
...
app/assets/javascripts/vue_merge_request_widget/index.js
View file @
6358004b
...
@@ -6,7 +6,7 @@ import Translate from '../vue_shared/translate';
...
@@ -6,7 +6,7 @@ import Translate from '../vue_shared/translate';
Vue
.
use
(
Translate
);
Vue
.
use
(
Translate
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
export
default
()
=>
{
gl
.
mrWidgetData
.
gitlabLogo
=
gon
.
gitlab_logo
;
gl
.
mrWidgetData
.
gitlabLogo
=
gon
.
gitlab_logo
;
const
vm
=
new
Vue
(
mrWidgetOptions
);
const
vm
=
new
Vue
(
mrWidgetOptions
);
...
@@ -14,4 +14,4 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -14,4 +14,4 @@ document.addEventListener('DOMContentLoaded', () => {
window
.
gl
.
mrWidget
=
{
window
.
gl
.
mrWidget
=
{
checkStatus
:
vm
.
checkStatus
,
checkStatus
:
vm
.
checkStatus
,
};
};
}
)
;
};
app/views/projects/merge_requests/show.html.haml
View file @
6358004b
...
@@ -23,9 +23,6 @@
...
@@ -23,9 +23,6 @@
#js-vue-mr-widget
.mr-widget
#js-vue-mr-widget
.mr-widget
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
'vue_merge_request_widget'
.content-block.content-block-small.emoji-list-container
.content-block.content-block-small.emoji-list-container
=
render
'award_emoji/awards_block'
,
awardable:
@merge_request
,
inline:
true
=
render
'award_emoji/awards_block'
,
awardable:
@merge_request
,
inline:
true
...
...
app/views/projects/network/show.html.haml
View file @
6358004b
-
breadcrumb_title
"Graph"
-
breadcrumb_title
"Graph"
-
page_title
"Graph"
,
@ref
-
page_title
"Graph"
,
@ref
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'network'
)
=
render
"head"
=
render
"head"
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.project-network
.project-network
...
...
app/views/projects/pipelines/index.html.haml
View file @
6358004b
...
@@ -12,6 +12,3 @@
...
@@ -12,6 +12,3 @@
"has-ci"
=>
@repository
.
gitlab_ci_yml
,
"has-ci"
=>
@repository
.
gitlab_ci_yml
,
"ci-lint-path"
=>
ci_lint_path
,
"ci-lint-path"
=>
ci_lint_path
,
"reset-cache-path"
=>
reset_cache_project_settings_ci_cd_path
(
@project
)
}
}
"reset-cache-path"
=>
reset_cache_project_settings_ci_cd_path
(
@project
)
}
}
=
webpack_bundle_tag
(
'common_vue'
)
=
webpack_bundle_tag
(
'pipelines'
)
config/webpack.config.js
View file @
6358004b
...
@@ -63,10 +63,8 @@ var config = {
...
@@ -63,10 +63,8 @@ var config = {
help
:
'
./help/help.js
'
,
help
:
'
./help/help.js
'
,
merge_conflicts
:
'
./merge_conflicts/merge_conflicts_bundle.js
'
,
merge_conflicts
:
'
./merge_conflicts/merge_conflicts_bundle.js
'
,
monitoring
:
'
./monitoring/monitoring_bundle.js
'
,
monitoring
:
'
./monitoring/monitoring_bundle.js
'
,
network
:
'
./network/network_bundle.js
'
,
notebook_viewer
:
'
./blob/notebook_viewer.js
'
,
notebook_viewer
:
'
./blob/notebook_viewer.js
'
,
pdf_viewer
:
'
./blob/pdf_viewer.js
'
,
pdf_viewer
:
'
./blob/pdf_viewer.js
'
,
pipelines
:
'
./pipelines/pipelines_bundle.js
'
,
pipelines_details
:
'
./pipelines/pipeline_details_bundle.js
'
,
pipelines_details
:
'
./pipelines/pipeline_details_bundle.js
'
,
profile
:
'
./profile/profile_bundle.js
'
,
profile
:
'
./profile/profile_bundle.js
'
,
project_import_gl
:
'
./projects/project_import_gitlab_project.js
'
,
project_import_gl
:
'
./projects/project_import_gitlab_project.js
'
,
...
@@ -79,7 +77,6 @@ var config = {
...
@@ -79,7 +77,6 @@ var config = {
stl_viewer
:
'
./blob/stl_viewer.js
'
,
stl_viewer
:
'
./blob/stl_viewer.js
'
,
terminal
:
'
./terminal/terminal_bundle.js
'
,
terminal
:
'
./terminal/terminal_bundle.js
'
,
ui_development_kit
:
'
./ui_development_kit.js
'
,
ui_development_kit
:
'
./ui_development_kit.js
'
,
vue_merge_request_widget
:
'
./vue_merge_request_widget/index.js
'
,
two_factor_auth
:
'
./two_factor_auth.js
'
,
two_factor_auth
:
'
./two_factor_auth.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