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
a96c3204
Commit
a96c3204
authored
Nov 24, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename issue_note_header to note_header
parent
d4a92a7c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
18 deletions
+18
-18
app/assets/javascripts/notes/components/issue_discussion.vue
app/assets/javascripts/notes/components/issue_discussion.vue
+4
-4
app/assets/javascripts/notes/components/issue_note.vue
app/assets/javascripts/notes/components/issue_note.vue
+3
-3
app/assets/javascripts/notes/components/note_actions.vue
app/assets/javascripts/notes/components/note_actions.vue
+2
-2
app/assets/javascripts/notes/components/note_header.vue
app/assets/javascripts/notes/components/note_header.vue
+0
-0
app/assets/javascripts/vue_shared/components/icon.vue
app/assets/javascripts/vue_shared/components/icon.vue
+2
-2
app/assets/javascripts/vue_shared/components/notes/system_note.vue
...s/javascripts/vue_shared/components/notes/system_note.vue
+4
-4
spec/javascripts/notes/components/note_header_spec.js
spec/javascripts/notes/components/note_header_spec.js
+3
-3
No files found.
app/assets/javascripts/notes/components/issue_discussion.vue
View file @
a96c3204
...
...
@@ -4,7 +4,7 @@
import
{
SYSTEM_NOTE
}
from
'
../constants
'
;
import
issueNote
from
'
./issue_note.vue
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
issueNoteHeader
from
'
./issue_
note_header.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
issueNoteForm
from
'
./issue_note_form.vue
'
;
...
...
@@ -27,7 +27,7 @@
components
:
{
issueNote
,
userAvatarLink
,
issueN
oteHeader
,
n
oteHeader
,
issueNoteSignedOutWidget
,
issueNoteEditedText
,
issueNoteForm
,
...
...
@@ -169,7 +169,7 @@
<div
class=
"timeline-content"
>
<div
class=
"discussion"
>
<div
class=
"discussion-header"
>
<
issue-
note-header
<note-header
:author=
"author"
:created-at=
"discussion.created_at"
:note-id=
"discussion.id"
...
...
@@ -177,7 +177,7 @@
@
toggleHandler=
"toggleDiscussionHandler"
action-text=
"started a discussion"
class=
"discussion"
/>
/>
<issue-note-edited-text
v-if=
"lastUpdatedAt"
:edited-at=
"lastUpdatedAt"
...
...
app/assets/javascripts/notes/components/issue_note.vue
View file @
a96c3204
...
...
@@ -2,7 +2,7 @@
import
{
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
Flash
from
'
../../flash
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
issueNoteHeader
from
'
./issue_
note_header.vue
'
;
import
noteHeader
from
'
./
note_header.vue
'
;
import
noteActions
from
'
./note_actions.vue
'
;
import
issueNoteBody
from
'
./issue_note_body.vue
'
;
import
eventHub
from
'
../event_hub
'
;
...
...
@@ -23,7 +23,7 @@
},
components
:
{
userAvatarLink
,
issueN
oteHeader
,
n
oteHeader
,
noteActions
,
issueNoteBody
,
},
...
...
@@ -155,7 +155,7 @@
</div>
<div
class=
"timeline-content"
>
<div
class=
"note-header"
>
<
issue-
note-header
<note-header
:author=
"author"
:created-at=
"note.created_at"
:note-id=
"note.id"
...
...
app/assets/javascripts/notes/components/note_actions.vue
View file @
a96c3204
...
...
@@ -5,8 +5,8 @@
import
emojiSmiley
from
'
icons/_emoji_smiley.svg
'
;
import
editSvg
from
'
icons/_icon_pencil.svg
'
;
import
ellipsisSvg
from
'
icons/_ellipsis_v.svg
'
;
import
loadingIcon
from
'
../..
/vue_shared/components/loading_icon.vue
'
;
import
tooltip
from
'
../..
/vue_shared/directives/tooltip
'
;
import
loadingIcon
from
'
~
/vue_shared/components/loading_icon.vue
'
;
import
tooltip
from
'
~
/vue_shared/directives/tooltip
'
;
export
default
{
name
:
'
noteActions
'
,
...
...
app/assets/javascripts/notes/components/
issue_
note_header.vue
→
app/assets/javascripts/notes/components/note_header.vue
View file @
a96c3204
File moved
app/assets/javascripts/vue_shared/components/icon.vue
View file @
a96c3204
...
...
@@ -22,7 +22,7 @@
size
:
{
type
:
Number
,
required
:
false
,
default
:
0
,
default
:
16
,
},
cssClasses
:
{
...
...
@@ -45,7 +45,7 @@
<
template
>
<svg
:class=
"[iconSizeClass, cssClasses]"
>
<use
<use
v-bind=
"
{'xlink:href':spriteHref}"/>
</svg>
</
template
>
app/assets/javascripts/vue_shared/components/notes/system_note.vue
View file @
a96c3204
...
...
@@ -17,7 +17,7 @@
* />
*/
import
{
mapGetters
}
from
'
vuex
'
;
import
issueNoteHeader
from
'
../../../notes/components/issue_
note_header.vue
'
;
import
noteHeader
from
'
~/notes/components/
note_header.vue
'
;
import
{
spriteIcon
}
from
'
../../../lib/utils/common_utils
'
;
export
default
{
...
...
@@ -29,7 +29,7 @@
},
},
components
:
{
issueN
oteHeader
,
n
oteHeader
,
},
computed
:
{
...
mapGetters
([
...
...
@@ -60,12 +60,12 @@
</div>
<div
class=
"timeline-content"
>
<div
class=
"note-header"
>
<
issue-
note-header
<note-header
:author=
"note.author"
:created-at=
"note.created_at"
:note-id=
"note.id"
:action-text-html=
"note.note_html"
/>
/>
</div>
</div>
</div>
...
...
spec/javascripts/notes/components/
issue_
note_header_spec.js
→
spec/javascripts/notes/components/note_header_spec.js
View file @
a96c3204
import
Vue
from
'
vue
'
;
import
issueNoteHeader
from
'
~/notes/components/issue_
note_header.vue
'
;
import
noteHeader
from
'
~/notes/components/
note_header.vue
'
;
import
store
from
'
~/notes/stores
'
;
describe
(
'
issue_
note_header component
'
,
()
=>
{
describe
(
'
note_header component
'
,
()
=>
{
let
vm
;
let
Component
;
beforeEach
(()
=>
{
Component
=
Vue
.
extend
(
issueN
oteHeader
);
Component
=
Vue
.
extend
(
n
oteHeader
);
});
afterEach
(()
=>
{
...
...
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