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
d5bc8ae9
Commit
d5bc8ae9
authored
May 10, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ensure merge-request-widget utilizes common_vue bundle
parent
84199f19
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+2
-1
config/webpack.config.js
config/webpack.config.js
+1
-0
No files found.
app/views/projects/merge_requests/_show.html.haml
View file @
d5bc8ae9
...
@@ -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 @
d5bc8ae9
...
@@ -151,6 +151,7 @@ var config = {
...
@@ -151,6 +151,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