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
Jérome Perrin
gitlab-ce
Commits
dc65609e
Commit
dc65609e
authored
Feb 02, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
migrate projects:merge_requests:creations:new to static bundle
parent
a6af8e8e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+0
-4
app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js
...ipts/pages/projects/merge_requests/creations/new/index.js
+2
-2
No files found.
app/assets/javascripts/dispatcher.js
View file @
dc65609e
...
@@ -50,10 +50,6 @@ var Dispatcher;
...
@@ -50,10 +50,6 @@ var Dispatcher;
case
'
projects:issues:edit
'
:
case
'
projects:issues:edit
'
:
shortcut_handler
=
true
;
shortcut_handler
=
true
;
break
;
break
;
case
'
projects:merge_requests:creations:new
'
:
import
(
'
./pages/projects/merge_requests/creations/new
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
case
'
projects:merge_requests:creations:diffs
'
:
case
'
projects:merge_requests:creations:diffs
'
:
import
(
'
./pages/projects/merge_requests/creations/diffs
'
)
import
(
'
./pages/projects/merge_requests/creations/diffs
'
)
.
then
(
callDefault
)
.
then
(
callDefault
)
...
...
app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js
View file @
dc65609e
import
Compare
from
'
~/compare
'
;
import
Compare
from
'
~/compare
'
;
import
MergeRequest
from
'
~/merge_request
'
;
import
MergeRequest
from
'
~/merge_request
'
;
export
default
()
=>
{
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
mrNewCompareNode
=
document
.
querySelector
(
'
.js-merge-request-new-compare
'
);
const
mrNewCompareNode
=
document
.
querySelector
(
'
.js-merge-request-new-compare
'
);
if
(
mrNewCompareNode
)
{
if
(
mrNewCompareNode
)
{
new
Compare
({
// eslint-disable-line no-new
new
Compare
({
// eslint-disable-line no-new
...
@@ -15,4 +15,4 @@ export default () => {
...
@@ -15,4 +15,4 @@ export default () => {
action
:
mrNewSubmitNode
.
dataset
.
mrSubmitAction
,
action
:
mrNewSubmitNode
.
dataset
.
mrSubmitAction
,
});
});
}
}
};
}
)
;
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