summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-10-03 06:51:14 +0000
committerDouwe Maan <douwe@gitlab.com>2017-10-03 06:51:14 +0000
commitbdc50ed779cb0c7d266c0f80f3e66a25da8b1964 (patch)
tree551f827437812b09c561259f5060c79c360303b1 /changelogs
parentea4c3371a738aa5b1825f9ea45ff7fdf64e889f8 (diff)
parent43c712f5dd40f69bc198670b6d778b7a61060318 (diff)
downloadgitlab-ce-bdc50ed779cb0c7d266c0f80f3e66a25da8b1964.tar.gz
Merge branch '38635-fix-gitlab-check-git-ssh-config' into 'master'
Whitelist authorized_keys.lock in the gitlab:check rake task Closes #38635 See merge request gitlab-org/gitlab-ce!14624
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/38635-fix-gitlab-check-git-ssh-config.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/38635-fix-gitlab-check-git-ssh-config.yml b/changelogs/unreleased/38635-fix-gitlab-check-git-ssh-config.yml
new file mode 100644
index 00000000000..49d0671233a
--- /dev/null
+++ b/changelogs/unreleased/38635-fix-gitlab-check-git-ssh-config.yml
@@ -0,0 +1,5 @@
+---
+title: Whitelist authorized_keys.lock in the gitlab:check rake task
+merge_request: 14624
+author:
+type: fixed