diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-04 11:43:45 -0500 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-05-04 11:43:45 -0500 |
commit | 4b1d580a84016397bc1dfd0d089b8ed7ace9228d (patch) | |
tree | 53103ac934607bd0196d76a2e60f3888b21f21d0 /app/assets/javascripts/members.js | |
parent | dde9b6698bb67dc34650a588ad3e644843067800 (diff) | |
download | gitlab-ce-4b1d580a84016397bc1dfd0d089b8ed7ace9228d.tar.gz |
Fix FE conflicts
Diffstat (limited to 'app/assets/javascripts/members.js')
-rw-r--r-- | app/assets/javascripts/members.js | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/app/assets/javascripts/members.js b/app/assets/javascripts/members.js index bfc4e551168..8291b8c4a70 100644 --- a/app/assets/javascripts/members.js +++ b/app/assets/javascripts/members.js @@ -31,27 +31,8 @@ toggleLabel(selected, $el) { return $el.text(); }, -<<<<<<< HEAD - clicked: (selected, $link) => { - this.formSubmit(null, $link); -======= clicked: (options) => { - const $link = options.$el; - - if (!$link.data('revert')) { - this.formSubmit(null, $link); - } else { - const { $memberListItem, $toggle, $dateInput } = this.getMemberListItems($link); - - $toggle.disable(); - $dateInput.disable(); - - this.overrideLdap($memberListItem, $link.data('endpoint'), false).fail(() => { - $toggle.enable(); - $dateInput.enable(); - }); - } ->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master + this.formSubmit(null, options.$el); }, }); }); |