summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/sidebar
diff options
context:
space:
mode:
authorSimon Knox <simon@gitlab.com>2017-12-04 16:19:07 +0000
committerFatih Acet <acetfatih@gmail.com>2017-12-04 16:19:07 +0000
commitbf85a90037714c3ba290c9966f435adbfa90b074 (patch)
tree3fcd899154c11f3e179303cdd341c19cdcdeaaae /app/assets/javascripts/sidebar
parenta1cd9be42910c89192e82659c09bf0242c8e5dae (diff)
downloadgitlab-ce-bf85a90037714c3ba290c9966f435adbfa90b074.tar.gz
issue note component rename
Diffstat (limited to 'app/assets/javascripts/sidebar')
-rw-r--r--app/assets/javascripts/sidebar/components/lock/edit_form.vue9
-rw-r--r--app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue9
2 files changed, 4 insertions, 14 deletions
diff --git a/app/assets/javascripts/sidebar/components/lock/edit_form.vue b/app/assets/javascripts/sidebar/components/lock/edit_form.vue
index c7a6edc7c70..242e826d471 100644
--- a/app/assets/javascripts/sidebar/components/lock/edit_form.vue
+++ b/app/assets/javascripts/sidebar/components/lock/edit_form.vue
@@ -18,11 +18,6 @@ export default {
required: true,
type: Function,
},
-
- issuableType: {
- required: true,
- type: String,
- },
},
mixins: [
@@ -39,13 +34,13 @@ export default {
<div class="dropdown open">
<div class="dropdown-menu sidebar-item-warning-message">
<p class="text" v-if="isLocked">
- Unlock this {{ issuableDisplayName(issuableType) }}?
+ Unlock this {{ issuableDisplayName }}?
<strong>Everyone</strong>
will be able to comment.
</p>
<p class="text" v-else>
- Lock this {{ issuableDisplayName(issuableType) }}?
+ Lock this {{ issuableDisplayName }}?
Only
<strong>project members</strong>
will be able to comment.
diff --git a/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue b/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
index 9aff53cf8af..04c3a96bf74 100644
--- a/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
+++ b/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
@@ -23,11 +23,6 @@ export default {
return mediatorObject.service && mediatorObject.service.update && mediatorObject.store;
},
},
-
- issuableType: {
- required: true,
- type: String,
- },
},
mixins: [
@@ -59,7 +54,7 @@ export default {
discussion_locked: locked,
})
.then(() => location.reload())
- .catch(() => Flash(this.__(`Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}`)));
+ .catch(() => Flash(this.__(`Something went wrong trying to change the locked state of this ${this.issuableDisplayName}`)));
},
},
};
@@ -77,7 +72,7 @@ export default {
</div>
<div class="title hide-collapsed">
- Lock {{issuableDisplayName(issuableType) }}
+ Lock {{ issuableDisplayName }}
<button
v-if="isEditable"
class="pull-right lock-edit btn btn-blank"