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
17979848
Commit
17979848
authored
Jun 21, 2017
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '34017-common-vue' into 'master'
Remove vue from main.bundle.js Closes #34017 See merge request !12327
parents
18ef5be6
701c1e1e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
pipelines_bundle.js
app/assets/javascripts/commit/pipelines/pipelines_bundle.js
+5
-0
merge_request_tabs.js
app/assets/javascripts/merge_request_tabs.js
+1
-3
No files found.
app/assets/javascripts/commit/pipelines/pipelines_bundle.js
View file @
17979848
...
...
@@ -10,6 +10,11 @@ import commitPipelinesTable from './pipelines_table.vue';
const
CommitPipelinesTable
=
Vue
.
extend
(
commitPipelinesTable
);
// export for use in merge_request_tabs.js (TODO: remove this hack when we understand how to load
// vue.js in merge_request_tabs.js)
window
.
gl
=
window
.
gl
||
{};
window
.
gl
.
CommitPipelinesTable
=
CommitPipelinesTable
;
document
.
addEventListener
(
'DOMContentLoaded'
,
()
=>
{
const
pipelineTableViewEl
=
document
.
querySelector
(
'#commit-pipeline-table-view'
);
...
...
app/assets/javascripts/merge_request_tabs.js
View file @
17979848
...
...
@@ -3,12 +3,10 @@
/* global Flash */
/* global notes */
import
Vue
from
'vue'
;
import
Cookies
from
'js-cookie'
;
import
'./breakpoints'
;
import
'./flash'
;
import
BlobForkSuggestion
from
'./blob/blob_fork_suggestion'
;
import
commitPipelinesTable
from
'./commit/pipelines/pipelines_table.vue'
;
/* eslint-disable max-len */
// MergeRequestTabs
...
...
@@ -236,7 +234,7 @@ import commitPipelinesTable from './commit/pipelines/pipelines_table.vue';
mountPipelinesView
()
{
const
pipelineTableViewEl
=
document
.
querySelector
(
'#commit-pipeline-table-view'
);
const
CommitPipelinesTable
=
Vue
.
extend
(
commitPipelinesTable
)
;
const
CommitPipelinesTable
=
gl
.
CommitPipelinesTable
;
this
.
commitPipelinesTable
=
new
CommitPipelinesTable
({
propsData
:
{
endpoint
:
pipelineTableViewEl
.
dataset
.
endpoint
,
...
...
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