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
27a6d65c
Commit
27a6d65c
authored
Feb 15, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add dispatcher imports for job details bundle
parent
efdde042
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
9 deletions
+11
-9
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+5
-0
app/assets/javascripts/jobs/job_details_bundle.js
app/assets/javascripts/jobs/job_details_bundle.js
+2
-2
app/assets/javascripts/pages/projects/jobs/show/index.js
app/assets/javascripts/pages/projects/jobs/show/index.js
+3
-0
app/views/projects/jobs/show.html.haml
app/views/projects/jobs/show.html.haml
+0
-4
config/webpack.config.js
config/webpack.config.js
+1
-3
No files found.
app/assets/javascripts/dispatcher.js
View file @
27a6d65c
...
...
@@ -192,6 +192,11 @@ var Dispatcher;
.
catch
(
fail
);
shortcut_handler
=
true
;
break
;
case
'
projects:jobs:show
'
:
import
(
'
./pages/projects/jobs/show
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'
projects:merge_requests:creations:new
'
:
import
(
'
./pages/projects/merge_requests/creations/new
'
)
.
then
(
callDefault
)
...
...
app/assets/javascripts/jobs/job_details_bundle.js
View file @
27a6d65c
...
...
@@ -3,7 +3,7 @@ import JobMediator from './job_details_mediator';
import
jobHeader
from
'
./components/header.vue
'
;
import
detailsBlock
from
'
./components/sidebar_details_block.vue
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
export
default
()
=>
{
const
dataset
=
document
.
getElementById
(
'
js-job-details-vue
'
).
dataset
;
const
mediator
=
new
JobMediator
({
endpoint
:
dataset
.
endpoint
});
...
...
@@ -55,4 +55,4 @@ document.addEventListener('DOMContentLoaded', () => {
});
},
});
}
)
;
};
app/assets/javascripts/pages/projects/jobs/show/index.js
0 → 100644
View file @
27a6d65c
import
initJobDetails
from
'
~/jobs/job_details_bundle
'
;
export
default
initJobDetails
;
app/views/projects/jobs/show.html.haml
View file @
27a6d65c
...
...
@@ -112,7 +112,3 @@
.js-build-options
{
data:
javascript_build_options
}
#js-job-details-vue
{
data:
{
endpoint:
project_job_path
(
@project
,
@build
,
format: :json
)
}
}
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'common_vue'
)
=
webpack_bundle_tag
(
'job_details'
)
config/webpack.config.js
View file @
27a6d65c
...
...
@@ -68,7 +68,6 @@ var config = {
help
:
'
./help/help.js
'
,
how_to_merge
:
'
./how_to_merge.js
'
,
issue_show
:
'
./issue_show/index.js
'
,
job_details
:
'
./jobs/job_details_bundle.js
'
,
locale
:
'
./locale/index.js
'
,
main
:
'
./main.js
'
,
merge_conflicts
:
'
./merge_conflicts/merge_conflicts_bundle.js
'
,
...
...
@@ -155,7 +154,7 @@ var config = {
include
:
/node_modules
\/
katex
\/
dist/
,
use
:
[
{
loader
:
'
style-loader
'
},
{
{
loader
:
'
css-loader
'
,
options
:
{
name
:
'
[name].[hash].[ext]
'
...
...
@@ -263,7 +262,6 @@ var config = {
'
filtered_search
'
,
'
groups
'
,
'
issue_show
'
,
'
job_details
'
,
'
merge_conflicts
'
,
'
monitoring
'
,
'
notebook_viewer
'
,
...
...
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