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
cf2e909c
Commit
cf2e909c
authored
Nov 27, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename discussion locked component
parent
f385d647
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
app/assets/javascripts/notes/components/discussion_locked_widget.vue
...javascripts/notes/components/discussion_locked_widget.vue
+7
-3
app/assets/javascripts/notes/components/issue_comment_form.vue
...ssets/javascripts/notes/components/issue_comment_form.vue
+6
-3
No files found.
app/assets/javascripts/notes/components/
issue_
discussion_locked_widget.vue
→
app/assets/javascripts/notes/components/discussion_locked_widget.vue
View file @
cf2e909c
<
script
>
import
Icon
from
'
../../vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Issuable
from
'
~/vue_shared/mixins/issuable
'
;
export
default
{
component
:
{
mixins
:
{
Issuable
,
},
components
:
{
Icon
,
},
};
...
...
@@ -16,7 +20,7 @@
:size=
"16"
class=
"icon"
>
</icon>
<span>
This
issue
is locked. Only
<b>
project members
</b>
can comment.
</span>
<span>
This
{{
issuableDisplayName
}
is
locked
.
Only
<
b
>
project
members
<
/b> can comment.</
span
>
<
/span
>
<
/div
>
<
/template
>
app/assets/javascripts/notes/components/issue_comment_form.vue
View file @
cf2e909c
...
...
@@ -9,7 +9,7 @@
import
eventHub
from
'
../event_hub
'
;
import
issueWarning
from
'
../../vue_shared/components/issue/issue_warning.vue
'
;
import
issueNoteSignedOutWidget
from
'
./issue_note_signed_out_widget.vue
'
;
import
issueDiscussionLockedWidget
from
'
./issue_
discussion_locked_widget.vue
'
;
import
discussionLockedWidget
from
'
./
discussion_locked_widget.vue
'
;
import
markdownField
from
'
../../vue_shared/components/markdown/field.vue
'
;
import
userAvatarLink
from
'
../../vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
issuableStateMixin
from
'
../mixins/issuable_state
'
;
...
...
@@ -30,7 +30,7 @@
components
:
{
issueWarning
,
issueNoteSignedOutWidget
,
issueD
iscussionLockedWidget
,
d
iscussionLockedWidget
,
markdownField
,
userAvatarLink
,
},
...
...
@@ -241,7 +241,10 @@
<
template
>
<div>
<issue-note-signed-out-widget
v-if=
"!isLoggedIn"
/>
<issue-discussion-locked-widget
v-else-if=
"!canCreateNote"
/>
<discussion-locked-widget
issuable-type=
"issue"
v-else-if=
"!canCreateNote"
/>
<ul
v-else
class=
"notes notes-form timeline"
>
...
...
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