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
08fa5377
Commit
08fa5377
authored
Mar 02, 2018
by
Mike Greiling
Committed by
Fatih Acet
Mar 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EE Port of "Remove mr_notes webpack bundle"
parent
aacb95dd
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
11 deletions
+12
-11
app/assets/javascripts/mr_notes/index.js
app/assets/javascripts/mr_notes/index.js
+2
-2
app/assets/javascripts/pages/projects/environments/terminal/index.js
...javascripts/pages/projects/environments/terminal/index.js
+3
-0
app/assets/javascripts/pages/projects/merge_requests/show/index.js
...s/javascripts/pages/projects/merge_requests/show/index.js
+6
-0
app/assets/javascripts/terminal/index.js
app/assets/javascripts/terminal/index.js
+1
-1
app/views/projects/environments/terminal.html.haml
app/views/projects/environments/terminal.html.haml
+0
-1
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+0
-3
config/webpack.config.js
config/webpack.config.js
+0
-4
No files found.
app/assets/javascripts/mr_notes/index.js
View file @
08fa5377
...
...
@@ -3,7 +3,7 @@ import notesApp from '../notes/components/notes_app.vue';
import
discussionCounter
from
'
../notes/components/discussion_counter.vue
'
;
import
store
from
'
../notes/stores
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
export
default
function
initMrNotes
()
{
new
Vue
({
// eslint-disable-line
el
:
'
#js-vue-mr-discussions
'
,
components
:
{
...
...
@@ -38,4 +38,4 @@ document.addEventListener('DOMContentLoaded', () => {
return
createElement
(
'
discussion-counter
'
);
},
});
}
);
}
app/assets/javascripts/pages/projects/environments/terminal/index.js
0 → 100644
View file @
08fa5377
import
initTerminal
from
'
~/terminal/
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
initTerminal
);
app/assets/javascripts/pages/projects/merge_requests/show/index.js
View file @
08fa5377
import
{
hasVueMRDiscussionsCookie
}
from
'
~/lib/utils/common_utils
'
;
import
initMrNotes
from
'
~/mr_notes
'
;
import
initSidebarBundle
from
'
~/sidebar/sidebar_bundle
'
;
import
initShow
from
'
../init_merge_request_show
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
initShow
();
initSidebarBundle
();
if
(
hasVueMRDiscussionsCookie
())
{
initMrNotes
();
}
});
app/assets/javascripts/terminal/
terminal_bundle
.js
→
app/assets/javascripts/terminal/
index
.js
View file @
08fa5377
...
...
@@ -6,4 +6,4 @@ import './terminal';
window
.
Terminal
=
Terminal
;
$
(()
=>
new
gl
.
Terminal
({
selector
:
'
#terminal
'
})
);
export
default
()
=>
new
gl
.
Terminal
({
selector
:
'
#terminal
'
}
);
app/views/projects/environments/terminal.html.haml
View file @
08fa5377
...
...
@@ -3,7 +3,6 @@
-
content_for
:page_specific_javascripts
do
=
stylesheet_link_tag
"xterm/xterm"
=
webpack_bundle_tag
(
"terminal"
)
%div
{
class:
container_class
}
.top-area
...
...
app/views/projects/merge_requests/show.html.haml
View file @
08fa5377
...
...
@@ -5,9 +5,6 @@
-
page_title
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
)"
,
"Merge Requests"
-
page_description
@merge_request
.
description
-
page_card_attributes
@merge_request
.
card_attributes
-
if
has_vue_discussions_cookie?
-
content_for
:page_specific_javascripts
do
=
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
)
}
}
=
render
"projects/merge_requests/mr_title"
...
...
config/webpack.config.js
View file @
08fa5377
...
...
@@ -48,10 +48,6 @@ function generateEntries() {
autoEntriesCount
=
Object
.
keys
(
autoEntries
).
length
;
const
manualEntries
=
{
monitoring
:
'
./monitoring/monitoring_bundle.js
'
,
mr_notes
:
'
./mr_notes/index.js
'
,
terminal
:
'
./terminal/terminal_bundle.js
'
,
common
:
'
./commons/index.js
'
,
common_vue
:
'
./vue_shared/vue_resource_interceptor.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