diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-11-13 22:24:03 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-11-13 22:24:03 +0000 |
| commit | 6fa53d297fafbab163fa3e3dd86d10d8f141f2da (patch) | |
| tree | 508bb4e52b8ec616f78d4f28e5d508c10028de1f /app | |
| parent | 6ffb9ffd4ad54fc452f9ae1e97a41f7a83f96a1c (diff) | |
| parent | a591b1c3aca8587f4f3764fa01cd19f3372bb23f (diff) | |
| download | gitlab-ce-6fa53d297fafbab163fa3e3dd86d10d8f141f2da.tar.gz | |
Merge branch 'bvl-refresh-member-listing-on-removal' into 'master'
Don't perform a JS request when deleting a membership.
Closes #39933 and #31720
See merge request gitlab-org/gitlab-ce!15344
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/members.js | 12 | ||||
| -rw-r--r-- | app/views/shared/members/_member.html.haml | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/app/assets/javascripts/members.js b/app/assets/javascripts/members.js index 6264750a4fb..52315e969d1 100644 --- a/app/assets/javascripts/members.js +++ b/app/assets/javascripts/members.js @@ -5,7 +5,6 @@ export default class Members { } addListeners() { - $('.project_member, .group_member').off('ajax:success').on('ajax:success', this.removeRow); $('.js-member-update-control').off('change').on('change', this.formSubmit.bind(this)); $('.js-edit-member-form').off('ajax:success').on('ajax:success', this.formSuccess.bind(this)); gl.utils.disableButtonIfEmptyField('#user_ids', 'input[name=commit]', 'change'); @@ -33,17 +32,6 @@ export default class Members { }); }); } - // eslint-disable-next-line class-methods-use-this - removeRow(e) { - const $target = $(e.target); - - if ($target.hasClass('btn-remove')) { - $target.closest('.member') - .fadeOut(function fadeOutMemberRow() { - $(this).remove(); - }); - } - } formSubmit(e, $el = null) { const $this = e ? $(e.currentTarget) : $el; diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml index 951b4dd7b36..2c27dd638a7 100644 --- a/app/views/shared/members/_member.html.haml +++ b/app/views/shared/members/_member.html.haml @@ -104,7 +104,6 @@ class: 'btn btn-remove prepend-left-10' - else = link_to member, - remote: true, method: :delete, data: { confirm: remove_member_message(member) }, class: 'btn btn-remove prepend-left-10', |