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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
0c9d4a16
Commit
0c9d4a16
authored
Mar 01, 2018
by
Simon Knox
Committed by
Phil Hughes
Mar 01, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
init sidebar bundle separately to allow EE override
parent
4b92ca99
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
38 deletions
+51
-38
app/assets/javascripts/pages/projects/issues/show.js
app/assets/javascripts/pages/projects/issues/show.js
+14
-0
app/assets/javascripts/pages/projects/issues/show/index.js
app/assets/javascripts/pages/projects/issues/show/index.js
+2
-10
app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
.../pages/projects/merge_requests/init_merge_request_show.js
+33
-0
app/assets/javascripts/pages/projects/merge_requests/show/index.js
...s/javascripts/pages/projects/merge_requests/show/index.js
+2
-28
No files found.
app/assets/javascripts/pages/projects/issues/show.js
0 → 100644
View file @
0c9d4a16
import
initIssuableSidebar
from
'
~/init_issuable_sidebar
'
;
import
Issue
from
'
~/issue
'
;
import
ShortcutsIssuable
from
'
~/shortcuts_issuable
'
;
import
ZenMode
from
'
~/zen_mode
'
;
import
'
~/notes/index
'
;
import
'
~/issue_show/index
'
;
export
default
function
()
{
new
Issue
();
// eslint-disable-line no-new
new
ShortcutsIssuable
();
// eslint-disable-line no-new
new
ZenMode
();
// eslint-disable-line no-new
initIssuableSidebar
();
}
app/assets/javascripts/pages/projects/issues/show/index.js
View file @
0c9d4a16
import
initIssuableSidebar
from
'
~/init_issuable_sidebar
'
;
import
initSidebarBundle
from
'
~/sidebar/sidebar_bundle
'
;
import
initSidebarBundle
from
'
~/sidebar/sidebar_bundle
'
;
import
Issue
from
'
~/issue
'
;
import
initShow
from
'
../show
'
;
import
ShortcutsIssuable
from
'
~/shortcuts_issuable
'
;
import
ZenMode
from
'
~/zen_mode
'
;
import
'
~/notes/index
'
;
import
'
~/issue_show/index
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
Issue
();
// eslint-disable-line no-new
initShow
();
new
ShortcutsIssuable
();
// eslint-disable-line no-new
new
ZenMode
();
// eslint-disable-line no-new
initIssuableSidebar
();
initSidebarBundle
();
initSidebarBundle
();
});
});
app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
0 → 100644
View file @
0c9d4a16
import
MergeRequest
from
'
~/merge_request
'
;
import
ZenMode
from
'
~/zen_mode
'
;
import
initNotes
from
'
~/init_notes
'
;
import
initIssuableSidebar
from
'
~/init_issuable_sidebar
'
;
import
initDiffNotes
from
'
~/diff_notes/diff_notes_bundle
'
;
import
ShortcutsIssuable
from
'
~/shortcuts_issuable
'
;
import
Diff
from
'
~/diff
'
;
import
{
handleLocationHash
}
from
'
~/lib/utils/common_utils
'
;
import
howToMerge
from
'
~/how_to_merge
'
;
import
initPipelines
from
'
~/commit/pipelines/pipelines_bundle
'
;
import
initWidget
from
'
../../../vue_merge_request_widget
'
;
export
default
function
()
{
new
Diff
();
// eslint-disable-line no-new
new
ZenMode
();
// eslint-disable-line no-new
initIssuableSidebar
();
initNotes
();
initDiffNotes
();
initPipelines
();
const
mrShowNode
=
document
.
querySelector
(
'
.merge-request
'
);
window
.
mergeRequest
=
new
MergeRequest
({
action
:
mrShowNode
.
dataset
.
mrAction
,
});
new
ShortcutsIssuable
(
true
);
// eslint-disable-line no-new
handleLocationHash
();
howToMerge
();
initWidget
();
}
app/assets/javascripts/pages/projects/merge_requests/show/index.js
View file @
0c9d4a16
import
MergeRequest
from
'
~/merge_request
'
;
import
ZenMode
from
'
~/zen_mode
'
;
import
initNotes
from
'
~/init_notes
'
;
import
initIssuableSidebar
from
'
~/init_issuable_sidebar
'
;
import
initDiffNotes
from
'
~/diff_notes/diff_notes_bundle
'
;
import
initSidebarBundle
from
'
~/sidebar/sidebar_bundle
'
;
import
initSidebarBundle
from
'
~/sidebar/sidebar_bundle
'
;
import
ShortcutsIssuable
from
'
~/shortcuts_issuable
'
;
import
initShow
from
'
../init_merge_request_show
'
;
import
Diff
from
'
~/diff
'
;
import
{
handleLocationHash
}
from
'
~/lib/utils/common_utils
'
;
import
howToMerge
from
'
~/how_to_merge
'
;
import
initPipelines
from
'
~/commit/pipelines/pipelines_bundle
'
;
import
initWidget
from
'
../../../../vue_merge_request_widget
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
Diff
();
// eslint-disable-line no-new
initShow
();
new
ZenMode
();
// eslint-disable-line no-new
initIssuableSidebar
();
initSidebarBundle
();
initSidebarBundle
();
initNotes
();
initDiffNotes
();
initPipelines
();
const
mrShowNode
=
document
.
querySelector
(
'
.merge-request
'
);
window
.
mergeRequest
=
new
MergeRequest
({
action
:
mrShowNode
.
dataset
.
mrAction
,
});
new
ShortcutsIssuable
(
true
);
// eslint-disable-line no-new
handleLocationHash
();
howToMerge
();
initWidget
();
});
});
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