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
b342d2ae
Commit
b342d2ae
authored
Mar 02, 2018
by
Mike Greiling
Committed by
Fatih Acet
Mar 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove mr_notes webpack bundle
parent
369d34c7
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
10 deletions
+8
-10
app/assets/javascripts/mr_notes/index.js
app/assets/javascripts/mr_notes/index.js
+2
-2
app/assets/javascripts/pages/projects/merge_requests/show/index.js
...s/javascripts/pages/projects/merge_requests/show/index.js
+6
-0
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+0
-5
config/webpack.config.js
config/webpack.config.js
+0
-3
No files found.
app/assets/javascripts/mr_notes/index.js
View file @
b342d2ae
...
@@ -3,7 +3,7 @@ import notesApp from '../notes/components/notes_app.vue';
...
@@ -3,7 +3,7 @@ import notesApp from '../notes/components/notes_app.vue';
import
discussionCounter
from
'
../notes/components/discussion_counter.vue
'
;
import
discussionCounter
from
'
../notes/components/discussion_counter.vue
'
;
import
store
from
'
../notes/stores
'
;
import
store
from
'
../notes/stores
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
export
default
function
initMrNotes
()
{
new
Vue
({
// eslint-disable-line
new
Vue
({
// eslint-disable-line
el
:
'
#js-vue-mr-discussions
'
,
el
:
'
#js-vue-mr-discussions
'
,
components
:
{
components
:
{
...
@@ -38,4 +38,4 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -38,4 +38,4 @@ document.addEventListener('DOMContentLoaded', () => {
return
createElement
(
'
discussion-counter
'
);
return
createElement
(
'
discussion-counter
'
);
},
},
});
});
}
);
}
app/assets/javascripts/pages/projects/merge_requests/show/index.js
View file @
b342d2ae
import
{
hasVueMRDiscussionsCookie
}
from
'
~/lib/utils/common_utils
'
;
import
initMrNotes
from
'
~/mr_notes
'
;
import
initSidebarBundle
from
'
~/sidebar/sidebar_bundle
'
;
import
initSidebarBundle
from
'
~/sidebar/sidebar_bundle
'
;
import
initShow
from
'
../init_merge_request_show
'
;
import
initShow
from
'
../init_merge_request_show
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
initShow
();
initShow
();
initSidebarBundle
();
initSidebarBundle
();
if
(
hasVueMRDiscussionsCookie
())
{
initMrNotes
();
}
});
});
app/views/projects/merge_requests/show.html.haml
View file @
b342d2ae
...
@@ -5,11 +5,6 @@
...
@@ -5,11 +5,6 @@
-
page_title
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
)"
,
"Merge Requests"
-
page_title
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
)"
,
"Merge Requests"
-
page_description
@merge_request
.
description
-
page_description
@merge_request
.
description
-
page_card_attributes
@merge_request
.
card_attributes
-
page_card_attributes
@merge_request
.
card_attributes
-
content_for
:page_specific_javascripts
do
=
webpack_bundle_tag
(
'common_vue'
)
-
if
has_vue_discussions_cookie?
=
webpack_bundle_tag
(
'mr_notes'
)
.merge-request
{
data:
{
mr_action:
j
(
params
[
:tab
].
presence
||
'show'
),
url:
merge_request_path
(
@merge_request
,
format: :json
),
project_path:
project_path
(
@merge_request
.
project
)
}
}
.merge-request
{
data:
{
mr_action:
j
(
params
[
:tab
].
presence
||
'show'
),
url:
merge_request_path
(
@merge_request
,
format: :json
),
project_path:
project_path
(
@merge_request
.
project
)
}
}
=
render
"projects/merge_requests/mr_title"
=
render
"projects/merge_requests/mr_title"
...
...
config/webpack.config.js
View file @
b342d2ae
...
@@ -43,9 +43,6 @@ function generateEntries() {
...
@@ -43,9 +43,6 @@ function generateEntries() {
autoEntriesCount
=
Object
.
keys
(
autoEntries
).
length
;
autoEntriesCount
=
Object
.
keys
(
autoEntries
).
length
;
const
manualEntries
=
{
const
manualEntries
=
{
monitoring
:
'
./monitoring/monitoring_bundle.js
'
,
mr_notes
:
'
./mr_notes/index.js
'
,
common
:
'
./commons/index.js
'
,
common
:
'
./commons/index.js
'
,
common_vue
:
'
./vue_shared/vue_resource_interceptor.js
'
,
common_vue
:
'
./vue_shared/vue_resource_interceptor.js
'
,
locale
:
'
./locale/index.js
'
,
locale
:
'
./locale/index.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