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
573dd592
Commit
573dd592
authored
Feb 28, 2019
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE port of noteable-discussion-ee-differences
parent
f2753695
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
2 deletions
+31
-2
app/assets/javascripts/diffs/components/diff_line_note_form.vue
...sets/javascripts/diffs/components/diff_line_note_form.vue
+3
-1
app/assets/javascripts/notes/components/noteable_discussion.vue
...sets/javascripts/notes/components/noteable_discussion.vue
+4
-1
app/assets/javascripts/notes/mixins/diff_line_note_form.js
app/assets/javascripts/notes/mixins/diff_line_note_form.js
+10
-0
app/assets/javascripts/vue_shared/components/empty_component.js
...sets/javascripts/vue_shared/components/empty_component.js
+3
-0
config/webpack.config.js
config/webpack.config.js
+11
-0
No files found.
app/assets/javascripts/diffs/components/diff_line_note_form.vue
View file @
573dd592
<
script
>
<
script
>
import
{
mapState
,
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
mapState
,
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
s__
}
from
'
~/locale
'
;
import
diffLineNoteFormMixin
from
'
ee_else_ce/notes/mixins/diff_line_note_form
'
;
import
noteForm
from
'
../../notes/components/note_form.vue
'
;
import
noteForm
from
'
../../notes/components/note_form.vue
'
;
import
autosave
from
'
../../notes/mixins/autosave
'
;
import
autosave
from
'
../../notes/mixins/autosave
'
;
import
{
DIFF_NOTE_TYPE
}
from
'
../constants
'
;
import
{
DIFF_NOTE_TYPE
}
from
'
../constants
'
;
...
@@ -9,7 +10,7 @@ export default {
...
@@ -9,7 +10,7 @@ export default {
components
:
{
components
:
{
noteForm
,
noteForm
,
},
},
mixins
:
[
autosave
],
mixins
:
[
autosave
,
diffLineNoteFormMixin
],
props
:
{
props
:
{
diffFileHash
:
{
diffFileHash
:
{
type
:
String
,
type
:
String
,
...
@@ -103,6 +104,7 @@ export default {
...
@@ -103,6 +104,7 @@ export default {
:help-page-path=
"helpPagePath"
:help-page-path=
"helpPagePath"
save-button-title=
"Comment"
save-button-title=
"Comment"
class=
"diff-comment-form"
class=
"diff-comment-form"
@
handleFormUpdateAddToReview=
"addToReview"
@
cancelForm=
"handleCancelCommentForm"
@
cancelForm=
"handleCancelCommentForm"
@
handleFormUpdate=
"handleSaveNote"
@
handleFormUpdate=
"handleSaveNote"
/>
/>
...
...
app/assets/javascripts/notes/components/noteable_discussion.vue
View file @
573dd592
...
@@ -6,6 +6,7 @@ import { truncateSha } from '~/lib/utils/text_utility';
...
@@ -6,6 +6,7 @@ import { truncateSha } from '~/lib/utils/text_utility';
import
{
s__
,
__
,
sprintf
}
from
'
~/locale
'
;
import
{
s__
,
__
,
sprintf
}
from
'
~/locale
'
;
import
systemNote
from
'
~/vue_shared/components/notes/system_note.vue
'
;
import
systemNote
from
'
~/vue_shared/components/notes/system_note.vue
'
;
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
import
diffLineNoteFormMixin
from
'
ee_else_ce/notes/mixins/diff_line_note_form
'
;
import
TimelineEntryItem
from
'
~/vue_shared/components/notes/timeline_entry_item.vue
'
;
import
TimelineEntryItem
from
'
~/vue_shared/components/notes/timeline_entry_item.vue
'
;
import
Flash
from
'
../../flash
'
;
import
Flash
from
'
../../flash
'
;
import
{
SYSTEM_NOTE
}
from
'
../constants
'
;
import
{
SYSTEM_NOTE
}
from
'
../constants
'
;
...
@@ -47,12 +48,13 @@ export default {
...
@@ -47,12 +48,13 @@ export default {
placeholderSystemNote
,
placeholderSystemNote
,
ResolveWithIssueButton
,
ResolveWithIssueButton
,
systemNote
,
systemNote
,
DraftNote
:
()
=>
import
(
'
ee_component/batch_comments/components/draft_note.vue
'
),
TimelineEntryItem
,
TimelineEntryItem
,
},
},
directives
:
{
directives
:
{
GlTooltip
:
GlTooltipDirective
,
GlTooltip
:
GlTooltipDirective
,
},
},
mixins
:
[
autosave
,
noteable
,
resolvable
,
discussionNavigation
],
mixins
:
[
autosave
,
noteable
,
resolvable
,
discussionNavigation
,
diffLineNoteFormMixin
],
props
:
{
props
:
{
discussion
:
{
discussion
:
{
type
:
Object
,
type
:
Object
,
...
@@ -510,6 +512,7 @@ Please check your network connection and try again.`;
...
@@ -510,6 +512,7 @@ Please check your network connection and try again.`;
:is-editing=
"false"
:is-editing=
"false"
:line=
"diffLine"
:line=
"diffLine"
save-button-title=
"Comment"
save-button-title=
"Comment"
@
handleFormUpdateAddToReview=
"addReplyToReview"
@
handleFormUpdate=
"saveReply"
@
handleFormUpdate=
"saveReply"
@
cancelForm=
"cancelReplyForm"
@
cancelForm=
"cancelReplyForm"
/>
/>
...
...
app/assets/javascripts/notes/mixins/diff_line_note_form.js
0 → 100644
View file @
573dd592
export
default
{
computed
:
{
draftForDiscussion
:
()
=>
()
=>
({}),
},
methods
:
{
showDraft
:
()
=>
false
,
addReplyToReview
:
()
=>
{},
addToReview
:
()
=>
{},
},
};
app/assets/javascripts/vue_shared/components/empty_component.js
0 → 100644
View file @
573dd592
export
default
{
render
:
()
=>
null
,
};
config/webpack.config.js
View file @
573dd592
...
@@ -245,6 +245,17 @@ module.exports = {
...
@@ -245,6 +245,17 @@ module.exports = {
jQuery
:
'
jquery
'
,
jQuery
:
'
jquery
'
,
}),
}),
new
webpack
.
NormalModuleReplacementPlugin
(
/^ee_component
\/(
.*
)\.
vue/
,
function
(
resource
)
{
if
(
Object
.
keys
(
module
.
exports
.
resolve
.
alias
).
indexOf
(
'
ee
'
)
>=
0
)
{
resource
.
request
=
resource
.
request
.
replace
(
/^ee_component/
,
'
ee
'
);
}
else
{
resource
.
request
=
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts/vue_shared/components/empty_component.js
'
);
}
}),
// compression can require a lot of compute time and is disabled in CI
// compression can require a lot of compute time and is disabled in CI
IS_PRODUCTION
&&
!
NO_COMPRESSION
&&
new
CompressionPlugin
(),
IS_PRODUCTION
&&
!
NO_COMPRESSION
&&
new
CompressionPlugin
(),
...
...
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