diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-05 13:12:23 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-05 13:12:23 +0000 |
| commit | 47e5a7f8e3c3a16bb8803f5156a65febf614f467 (patch) | |
| tree | b0a5f7d8f596750503feac86eaa76b4883202337 /app/assets/javascripts/groups | |
| parent | 396e7647f836c0cb87d19252fb6d31e91e0dbd6c (diff) | |
| parent | 2c47f0924fc5534035905746046ab0f5e9c99f23 (diff) | |
| download | gitlab-ce-47e5a7f8e3c3a16bb8803f5156a65febf614f467.tar.gz | |
Merge branch 'winh-modal-target-id' into 'master'
Add id to modal.vue to support data-toggle="modal"
Closes #41584
See merge request gitlab-org/gitlab-ce!16189
Diffstat (limited to 'app/assets/javascripts/groups')
| -rw-r--r-- | app/assets/javascripts/groups/components/item_actions.vue | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/groups/components/item_actions.vue b/app/assets/javascripts/groups/components/item_actions.vue index a685960d862..0dd0783ce06 100644 --- a/app/assets/javascripts/groups/components/item_actions.vue +++ b/app/assets/javascripts/groups/components/item_actions.vue @@ -45,11 +45,9 @@ export default { onLeaveGroup() { this.modalStatus = true; }, - leaveGroup(leaveConfirmed) { + leaveGroup() { this.modalStatus = false; - if (leaveConfirmed) { - eventHub.$emit('leaveGroup', this.group, this.parentGroup); - } + eventHub.$emit('leaveGroup', this.group, this.parentGroup); }, }, }; |