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
4ce19967
Commit
4ce19967
authored
Nov 24, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
issue_note_edited_text to note_edited_text
parent
a96c3204
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/notes/components/issue_discussion.vue
app/assets/javascripts/notes/components/issue_discussion.vue
+3
-3
app/assets/javascripts/notes/components/issue_note_body.vue
app/assets/javascripts/notes/components/issue_note_body.vue
+3
-3
app/assets/javascripts/notes/components/note_edited_text.vue
app/assets/javascripts/notes/components/note_edited_text.vue
+0
-0
spec/javascripts/notes/components/note_edited_text_spec.js
spec/javascripts/notes/components/note_edited_text_spec.js
+3
-3
No files found.
app/assets/javascripts/notes/components/issue_discussion.vue
View file @
4ce19967
...
...
@@ -6,7 +6,7 @@
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
noteHeader
from
'
./note_header.vue
'
;
import
issueNoteSignedOutWidget
from
'
./issue_note_signed_out_widget.vue
'
;
import
issueNoteEditedText
from
'
./issue_
note_edited_text.vue
'
;
import
noteEditedText
from
'
./
note_edited_text.vue
'
;
import
issueNoteForm
from
'
./issue_note_form.vue
'
;
import
placeholderNote
from
'
../../vue_shared/components/notes/placeholder_note.vue
'
;
import
placeholderSystemNote
from
'
../../vue_shared/components/notes/placeholder_system_note.vue
'
;
...
...
@@ -29,7 +29,7 @@
userAvatarLink
,
noteHeader
,
issueNoteSignedOutWidget
,
issueN
oteEditedText
,
n
oteEditedText
,
issueNoteForm
,
placeholderNote
,
placeholderSystemNote
,
...
...
@@ -178,7 +178,7 @@
action-text=
"started a discussion"
class=
"discussion"
/>
<
issue-
note-edited-text
<note-edited-text
v-if=
"lastUpdatedAt"
:edited-at=
"lastUpdatedAt"
:edited-by=
"lastUpdatedBy"
...
...
app/assets/javascripts/notes/components/issue_note_body.vue
View file @
4ce19967
<
script
>
import
issueNoteEditedText
from
'
./issue_
note_edited_text.vue
'
;
import
noteEditedText
from
'
./
note_edited_text.vue
'
;
import
issueNoteAwardsList
from
'
./issue_note_awards_list.vue
'
;
import
issueNoteAttachment
from
'
./issue_note_attachment.vue
'
;
import
issueNoteForm
from
'
./issue_note_form.vue
'
;
...
...
@@ -26,7 +26,7 @@
autosave
,
],
components
:
{
issueN
oteEditedText
,
n
oteEditedText
,
issueNoteAwardsList
,
issueNoteAttachment
,
issueNoteForm
,
...
...
@@ -101,7 +101,7 @@
v-model=
"note.note"
:data-update-url=
"note.path"
class=
"hidden js-task-list-field"
></textarea>
<
issue-
note-edited-text
<note-edited-text
v-if=
"note.last_edited_at"
:edited-at=
"note.last_edited_at"
:edited-by=
"note.last_edited_by"
...
...
app/assets/javascripts/notes/components/
issue_
note_edited_text.vue
→
app/assets/javascripts/notes/components/note_edited_text.vue
View file @
4ce19967
File moved
spec/javascripts/notes/components/
issue_
note_edited_text_spec.js
→
spec/javascripts/notes/components/note_edited_text_spec.js
View file @
4ce19967
import
Vue
from
'
vue
'
;
import
issueNoteEditedText
from
'
~/notes/components/issue_
note_edited_text.vue
'
;
import
noteEditedText
from
'
~/notes/components/
note_edited_text.vue
'
;
describe
(
'
issue_
note_edited_text
'
,
()
=>
{
describe
(
'
note_edited_text
'
,
()
=>
{
let
vm
;
let
props
;
beforeEach
(()
=>
{
const
Component
=
Vue
.
extend
(
issueN
oteEditedText
);
const
Component
=
Vue
.
extend
(
n
oteEditedText
);
props
=
{
actionText
:
'
Edited
'
,
className
:
'
foo-bar
'
,
...
...
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