diff options
| author | Marin Jankovski <marin@gitlab.com> | 2018-09-24 10:15:47 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2018-09-24 10:15:47 +0000 |
| commit | 4ce9f2fdfb6d135e6229675b9965c1b90efdfcfe (patch) | |
| tree | 71372f3bba3829db1025e599571b03d2d741daa0 /app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue | |
| parent | 17a4f24c790797548137cf04524f115fe238fd7e (diff) | |
| parent | aef686d4a91d86bbfbe6d3c85c7cd98d3558d6f7 (diff) | |
| download | gitlab-ce-4ce9f2fdfb6d135e6229675b9965c1b90efdfcfe.tar.gz | |
Merge branch 'upgrade-eslint' into 'master'
Upgrade eslint to v5.x
See merge request gitlab-org/gitlab-ce!21825
Diffstat (limited to 'app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue')
| -rw-r--r-- | app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue b/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue index d6aa4bb95d2..8d5efcdcd96 100644 --- a/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue +++ b/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue @@ -155,10 +155,7 @@ /> </form> </template> - <template - slot="secondary-button" - slot-scope="props" - > + <template slot="secondary-button"> <button :disabled="!canSubmit" type="button" |