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
c594ed49
Commit
c594ed49
authored
May 16, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update diff_notes_bundle to ES module syntax
parent
4322d3c2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
18 deletions
+13
-18
app/assets/javascripts/diff_notes/diff_notes_bundle.js
app/assets/javascripts/diff_notes/diff_notes_bundle.js
+12
-13
app/assets/javascripts/diff_notes/services/resolve.js
app/assets/javascripts/diff_notes/services/resolve.js
+1
-5
No files found.
app/assets/javascripts/diff_notes/diff_notes_bundle.js
View file @
c594ed49
...
...
@@ -2,19 +2,18 @@
/* global ResolveCount */
import
Vue
from
'
vue
'
;
require
(
'
./models/discussion
'
);
require
(
'
./models/note
'
);
require
(
'
./stores/comments
'
);
require
(
'
./services/resolve
'
);
require
(
'
./mixins/discussion
'
);
require
(
'
./components/comment_resolve_btn
'
);
require
(
'
./components/jump_to_discussion
'
);
require
(
'
./components/resolve_btn
'
);
require
(
'
./components/resolve_count
'
);
require
(
'
./components/resolve_discussion_btn
'
);
require
(
'
./components/diff_note_avatars
'
);
require
(
'
./components/new_issue_for_discussion
'
);
import
'
./models/discussion
'
;
import
'
./models/note
'
;
import
'
./stores/comments
'
;
import
'
./services/resolve
'
;
import
'
./mixins/discussion
'
;
import
'
./components/comment_resolve_btn
'
;
import
'
./components/jump_to_discussion
'
;
import
'
./components/resolve_btn
'
;
import
'
./components/resolve_count
'
;
import
'
./components/resolve_discussion_btn
'
;
import
'
./components/diff_note_avatars
'
;
import
'
./components/new_issue_for_discussion
'
;
$
(()
=>
{
const
projectPath
=
document
.
querySelector
(
'
.merge-request
'
).
dataset
.
projectPath
;
...
...
app/assets/javascripts/diff_notes/services/resolve.js
View file @
c594ed49
...
...
@@ -3,11 +3,7 @@
/* global CommentsStore */
import
Vue
from
'
vue
'
;
import
VueResource
from
'
vue-resource
'
;
require
(
'
../../vue_shared/vue_resource_interceptor
'
);
Vue
.
use
(
VueResource
);
import
'
../../vue_shared/vue_resource_interceptor
'
;
window
.
gl
=
window
.
gl
||
{};
...
...
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