diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-06 15:06:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-06 15:06:17 +0300 |
| commit | 4dcee85bb2384604153165f1296fb86d609c71cc (patch) | |
| tree | 99e86ecf580e517ac8971ef4b2b9998c75b540ac /changelogs | |
| parent | d15180e00b209d0fbe3d8ce61b3af269aecdf7f5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/27433-fix-vulnerable-code-copied-from-devise.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/35440-for-com-namespaces-with-expired-trials-remove-start-trial-ctas.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/27433-fix-vulnerable-code-copied-from-devise.yml b/changelogs/unreleased/27433-fix-vulnerable-code-copied-from-devise.yml new file mode 100644 index 00000000000..0332d85c352 --- /dev/null +++ b/changelogs/unreleased/27433-fix-vulnerable-code-copied-from-devise.yml @@ -0,0 +1,5 @@ +--- +title: Update incrementing of failed logins to be thread-safe +merge_request: 19614 +author: +type: security diff --git a/changelogs/unreleased/35440-for-com-namespaces-with-expired-trials-remove-start-trial-ctas.yml b/changelogs/unreleased/35440-for-com-namespaces-with-expired-trials-remove-start-trial-ctas.yml new file mode 100644 index 00000000000..3b4ec67334f --- /dev/null +++ b/changelogs/unreleased/35440-for-com-namespaces-with-expired-trials-remove-start-trial-ctas.yml @@ -0,0 +1,5 @@ +--- +title: Hide trial banner for namespaces with expired trials +merge_request: 19510 +author: +type: changed |