diff options
| author | James Lopez <james@jameslopez.es> | 2018-03-19 16:56:27 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-03-19 16:56:27 +0100 |
| commit | 296040c0491c8fd3083c39f8ccc8631413e3204d (patch) | |
| tree | 326920ea71bce1538cb099d3e83cd52e31e7d355 /changelogs | |
| parent | df989d529b43d77ca110de11262ad8395c13aa04 (diff) | |
| parent | 709f4d1226c98810073fd6f8f1e6fc6a579d3da1 (diff) | |
| download | gitlab-ce-296040c0491c8fd3083c39f8ccc8631413e3204d.tar.gz | |
Merge remote-tracking branch 'dev/10-6-stable' into 10-6-stable-prepare-rc7
Diffstat (limited to 'changelogs')
4 files changed, 10 insertions, 10 deletions
diff --git a/changelogs/unreleased/35475-lazy-diff.yml b/changelogs/unreleased/35475-lazy-diff.yml deleted file mode 100644 index bafa66ebe39..00000000000 --- a/changelogs/unreleased/35475-lazy-diff.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: lazy load diffs on merge request discussions -merge_request: -author: -type: performance diff --git a/changelogs/unreleased/fix-auth0-unsafe-login.yml b/changelogs/unreleased/fix-auth0-unsafe-login.yml new file mode 100644 index 00000000000..01c6ea69dcc --- /dev/null +++ b/changelogs/unreleased/fix-auth0-unsafe-login.yml @@ -0,0 +1,5 @@ +--- +title: Fix GitLab Auth0 integration signing in the wrong user +merge_request: +author: +type: security diff --git a/changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml b/changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml new file mode 100644 index 00000000000..7fa6f6a5874 --- /dev/null +++ b/changelogs/unreleased/fj-15329-services-callbacks-ssrf.yml @@ -0,0 +1,5 @@ +--- +title: Fixed some SSRF vulnerabilities in services, hooks and integrations +merge_request: 2337 +author: +type: security diff --git a/changelogs/unreleased/remove-unnecessary-validate-project.yml b/changelogs/unreleased/remove-unnecessary-validate-project.yml deleted file mode 100644 index ebc8da03dd8..00000000000 --- a/changelogs/unreleased/remove-unnecessary-validate-project.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'Remove unecessary validate: true from belongs_to :project' -merge_request: -author: -type: fixed |