diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-05-07 16:48:24 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-05-07 16:48:24 +0000 |
| commit | 5609523a6b877aca658c6bcc5906c3eddfae1213 (patch) | |
| tree | 1368e2d50f2cfaec4a3b4ddc404fbb273f3e1095 | |
| parent | c4fcac0625ef86cb69ecf2e83607db780f7d710f (diff) | |
| parent | fc255486fb79022e0269744d89f00ae5206479d1 (diff) | |
| download | gitlab-ce-5609523a6b877aca658c6bcc5906c3eddfae1213.tar.gz | |
Merge branch 'fix/js-error-ssh-key-view' into 'master'
fix(profile): disable SSH key validation in key details view
See merge request gitlab-org/gitlab-ce!28180
| -rw-r--r-- | app/assets/javascripts/pages/profiles/keys/index.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-js-error-ssh-key-view.yml | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/profiles/keys/index.js b/app/assets/javascripts/pages/profiles/keys/index.js index 1cd3ee1dfdb..d3dcd21f456 100644 --- a/app/assets/javascripts/pages/profiles/keys/index.js +++ b/app/assets/javascripts/pages/profiles/keys/index.js @@ -2,6 +2,8 @@ import AddSshKeyValidation from '~/profile/add_ssh_key_validation'; document.addEventListener('DOMContentLoaded', () => { const input = document.querySelector('.js-add-ssh-key-validation-input'); + if (!input) return; + const warning = document.querySelector('.js-add-ssh-key-validation-warning'); const originalSubmit = input.form.querySelector('.js-add-ssh-key-validation-original-submit'); const confirmSubmit = warning.querySelector('.js-add-ssh-key-validation-confirm-submit'); diff --git a/changelogs/unreleased/fix-js-error-ssh-key-view.yml b/changelogs/unreleased/fix-js-error-ssh-key-view.yml new file mode 100644 index 00000000000..0615f2ee217 --- /dev/null +++ b/changelogs/unreleased/fix-js-error-ssh-key-view.yml @@ -0,0 +1,5 @@ +--- +title: disable SSH key validation in key details view +merge_request: 28180 +author: Roger Meier +type: fixed |