diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-08-17 09:24:17 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-08-17 09:24:17 -0500 |
| commit | 65a5b345c6d8e2a2c1345569330454604bdeec9b (patch) | |
| tree | a60e4846c58ccb3315e2517e50afe30ef7f958a8 | |
| parent | c6c964c92b15d9fe0131b9139e95f6c5d345b21f (diff) | |
| download | gitlab-ce-use-gitlab-ui-modal.tar.gz | |
Use updated gl-modal templateuse-gitlab-ui-modal
| -rw-r--r-- | app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue | 8 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue index b00b4205de7..9868358d006 100644 --- a/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue +++ b/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue @@ -59,10 +59,14 @@ export default { class="d-inline-block" @ok="onSubmit" > - <template slot="modal-trigger"> + <template + slot="modalTrigger" + slot-scope="{ toggle }" + > <button - class="btn btn-danger" type="button" + class="btn btn-danger" + @click="toggle()" > {{ triggerButtonTitle }} </button> diff --git a/package.json b/package.json index b7741e7aa08..fbf9fea0953 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "dependencies": { "@gitlab-org/gitlab-svgs": "^1.27.0", - "@gitlab-org/gitlab-ui": "https://gitlab.com/gitlab-org/frontend/gitlab-ui.git#4fe1d06", + "@gitlab-org/gitlab-ui": "https://gitlab.com/gitlab-org/gitlab-ui/-/jobs/89929870/artifacts/raw/gitlab-ui.add-modal.tgz", "autosize": "^4.0.0", "axios": "^0.17.1", "babel-core": "^6.26.3", diff --git a/yarn.lock b/yarn.lock index b9d0a26999b..2f21f304bc0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -82,9 +82,9 @@ version "1.27.0" resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.27.0.tgz#638e70399ebd59e503732177316bb9a18bf7a13f" -"@gitlab-org/gitlab-ui@https://gitlab.com/gitlab-org/frontend/gitlab-ui.git#4fe1d06": +"@gitlab-org/gitlab-ui@https://gitlab.com/gitlab-org/gitlab-ui/-/jobs/89929870/artifacts/raw/gitlab-ui.add-modal.tgz": version "1.0.5" - resolved "https://gitlab.com/gitlab-org/frontend/gitlab-ui.git#4fe1d0693d27df1809e55909709c20d3658b69b3" + resolved "https://gitlab.com/gitlab-org/gitlab-ui/-/jobs/89929870/artifacts/raw/gitlab-ui.add-modal.tgz#f3bcda059b35745281a3c16fce073f57732b0a90" dependencies: "@gitlab-org/gitlab-svgs" "^1.23.0" bootstrap-vue "^2.0.0-rc.11" |