BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
d2cfd406
Commit
d2cfd406
authored
Jul 26, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix edit text
parent
ffef1669
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
issue_comment_form.vue
...ssets/javascripts/notes/components/issue_comment_form.vue
+1
-1
issue_discussion.vue
app/assets/javascripts/notes/components/issue_discussion.vue
+3
-3
issue_note_edited_text.vue
...s/javascripts/notes/components/issue_note_edited_text.vue
+7
-7
issue_notes.vue
app/assets/javascripts/notes/components/issue_notes.vue
+1
-1
No files found.
app/assets/javascripts/notes/components/issue_comment_form.vue
View file @
d2cfd406
...
@@ -187,7 +187,7 @@
...
@@ -187,7 +187,7 @@
<textarea
<textarea
id=
"note-body"
id=
"note-body"
name=
"note[note]"
name=
"note[note]"
class=
"note-textarea js-gfm-input js-autosize markdown-area"
class=
"note-textarea js-gfm-input js-autosize markdown-area
js-note-text
"
data-supports-slash-commands=
"true"
data-supports-slash-commands=
"true"
data-supports-quick-actions=
"true"
data-supports-quick-actions=
"true"
aria-label=
"Description"
aria-label=
"Description"
...
...
app/assets/javascripts/notes/components/issue_discussion.vue
View file @
d2cfd406
<
script
>
<
script
>
/* global Flash */
/* global Flash */
import
{
mapActions
}
from
'vuex'
;
import
{
mapActions
,
mapMutations
}
from
'vuex'
;
import
{
TOGGLE_DISCUSSION
}
from
'../stores/mutation_types'
;
import
{
TOGGLE_DISCUSSION
}
from
'../stores/mutation_types'
;
import
{
SYSTEM_NOTE
}
from
'../constants'
;
import
{
SYSTEM_NOTE
}
from
'../constants'
;
import
issueNote
from
'./issue_note.vue'
;
import
issueNote
from
'./issue_note.vue'
;
...
@@ -129,13 +129,13 @@
...
@@ -129,13 +129,13 @@
:note-id=
"discussion.id"
:note-id=
"discussion.id"
:include-toggle=
"true"
:include-toggle=
"true"
:toggle-handler=
"toggleDiscussion"
:toggle-handler=
"toggleDiscussion"
action
T
ext=
"started a discussion"
action
-t
ext=
"started a discussion"
/>
/>
<issue-note-edited-text
<issue-note-edited-text
v-if=
"note.last_updated_by"
v-if=
"note.last_updated_by"
:edited-at=
"note.last_updated_at"
:edited-at=
"note.last_updated_at"
:edited-by=
"note.last_updated_by"
:edited-by=
"note.last_updated_by"
action
T
ext=
"Last updated"
action
-t
ext=
"Last updated"
className=
"discussion-headline-light js-discussion-headline"
/>
className=
"discussion-headline-light js-discussion-headline"
/>
</div>
</div>
</div>
</div>
...
...
app/assets/javascripts/notes/components/issue_note_edited_text.vue
View file @
d2cfd406
...
@@ -29,16 +29,16 @@
...
@@ -29,16 +29,16 @@
<
template
>
<
template
>
<div
:class=
"className"
>
<div
:class=
"className"
>
<span>
{{
actionText
}}
</span>
{{
actionText
}}
<span>
by
</span>
<a
:href=
"editedBy.path"
class=
"author_link"
>
<span>
{{
editedBy
.
name
}}
</span>
</a>
<time-ago-tooltip
<time-ago-tooltip
:time=
"editedAt"
:time=
"editedAt"
tooltip-placement=
"bottom"
tooltip-placement=
"bottom"
/>
/>
by
<a
:href=
"editedBy.path"
class=
"author_link"
>
{{
editedBy
.
name
}}
</a>
</div>
</div>
</
template
>
</
template
>
app/assets/javascripts/notes/components/issue_notes.vue
View file @
d2cfd406
...
@@ -103,7 +103,7 @@
...
@@ -103,7 +103,7 @@
const
endpoint
=
this
.
notesById
[
noteId
].
toggle_award_path
;
const
endpoint
=
this
.
notesById
[
noteId
].
toggle_award_path
;
this
.
toggleAward
({
endpoint
,
awardName
,
noteId
})
this
.
toggleAward
({
endpoint
,
awardName
,
noteId
})
.
catch
(()
=>
{
new
Flash
(
'Something went wrong on our end.'
)}
);
.
catch
(()
=>
Flash
(
'Something went wrong on our end.'
)
);
});
});
$
(
document
).
on
(
'issuable:change'
,
(
e
,
isClosed
)
=>
{
$
(
document
).
on
(
'issuable:change'
,
(
e
,
isClosed
)
=>
{
...
...
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