summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/24921-hide-prompt-to-add-ssh-key-if-ssh-protocol-is-disabled.yml
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2016-12-14 12:36:27 +0200
committerValery Sizov <valery@gitlab.com>2016-12-14 12:36:27 +0200
commit468d575fc73881900f4a4cb1fa71c187d77429a7 (patch)
tree05b00d7f00e04202c34de41e6feb566426e19e3f /changelogs/unreleased/24921-hide-prompt-to-add-ssh-key-if-ssh-protocol-is-disabled.yml
parent8f0cef0b6e5e950efdf3ebfe8f9f846095fff9d9 (diff)
parent78f89f7ad900ec2f2993a70caa2eb5dbf9e2496f (diff)
downloadgitlab-ce-468d575fc73881900f4a4cb1fa71c187d77429a7.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2
Diffstat (limited to 'changelogs/unreleased/24921-hide-prompt-to-add-ssh-key-if-ssh-protocol-is-disabled.yml')
-rw-r--r--changelogs/unreleased/24921-hide-prompt-to-add-ssh-key-if-ssh-protocol-is-disabled.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/24921-hide-prompt-to-add-ssh-key-if-ssh-protocol-is-disabled.yml b/changelogs/unreleased/24921-hide-prompt-to-add-ssh-key-if-ssh-protocol-is-disabled.yml
new file mode 100644
index 00000000000..4d4019e770e
--- /dev/null
+++ b/changelogs/unreleased/24921-hide-prompt-to-add-ssh-key-if-ssh-protocol-is-disabled.yml
@@ -0,0 +1,4 @@
+---
+title: Don't display prompt to add SSH keys if SSH protocol is disabled
+merge_request: 7840
+author: Andrew Smith (EspadaV8)