diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-10 22:47:38 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-10 22:47:38 +0000 |
| commit | ad3c1573a5c6e94d37d9982f90d9d658718d3294 (patch) | |
| tree | 3b028b557673ed3e7904cde70c5e51a580ed91ec /changelogs | |
| parent | df8bfb18cf15a738c1d6d1b82286a4098f18f954 (diff) | |
| parent | b29692168184cef044c6a1b244f791c56c10fb1c (diff) | |
| download | gitlab-ce-ad3c1573a5c6e94d37d9982f90d9d658718d3294.tar.gz | |
Merge branch 'jej/security-release-2017-08-10' into 'master'
Security release 2017-08-10 patch
See merge request !13477
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/fix-import-symbolink-links.yml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/rs-alphanumeric-ssh-params.yml | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-import-symbolink-links.yml b/changelogs/unreleased/fix-import-symbolink-links.yml new file mode 100644 index 00000000000..36e73821bdc --- /dev/null +++ b/changelogs/unreleased/fix-import-symbolink-links.yml @@ -0,0 +1,4 @@ +--- +title: Remove hidden symlinks from project import files +merge_request: +author: diff --git a/changelogs/unreleased/rs-alphanumeric-ssh-params.yml b/changelogs/unreleased/rs-alphanumeric-ssh-params.yml new file mode 100644 index 00000000000..426b01cafad --- /dev/null +++ b/changelogs/unreleased/rs-alphanumeric-ssh-params.yml @@ -0,0 +1,5 @@ +--- +title: Disallow Git URLs that include a username or hostname beginning with a non-alphanumeric + character +merge_request: +author: |