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
1142d6ba
Commit
1142d6ba
authored
May 16, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'use-common-vue-for-merge-request-widget' into 'master'
Ensure vue_merge_request_widget utilizes common_vue bundle See merge request !11269
parents
10a9ba3a
d5bc8ae9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+2
-1
webpack.config.js
config/webpack.config.js
+1
-0
No files found.
app/views/projects/merge_requests/_show.html.haml
View file @
1142d6ba
...
@@ -21,7 +21,8 @@
...
@@ -21,7 +21,8 @@
#js-vue-mr-widget
.mr-widget
#js-vue-mr-widget
.mr-widget
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'vue_merge_request_widget'
)
=
webpack_bundle_tag
'common_vue'
=
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
...
...
config/webpack.config.js
View file @
1142d6ba
...
@@ -152,6 +152,7 @@ var config = {
...
@@ -152,6 +152,7 @@ var config = {
'schedule_form'
,
'schedule_form'
,
'schedules_index'
,
'schedules_index'
,
'sidebar'
,
'sidebar'
,
'vue_merge_request_widget'
,
],
],
minChunks
:
function
(
module
,
count
)
{
minChunks
:
function
(
module
,
count
)
{
return
module
.
resource
&&
(
/vue_shared/
).
test
(
module
.
resource
);
return
module
.
resource
&&
(
/vue_shared/
).
test
(
module
.
resource
);
...
...
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