Merge branch 'security-websocket-extensions-update' into 'master'

Security websocket extensions update See merge request gitlab-org/security/gitlab!616

Merge branch 'security-websocket-extensions-update' into 'master'
Security websocket extensions update See merge request gitlab-org/security/gitlab!616
dd883716 · Marin Jankovski · f383a29a · 1bc675ad · dd883716 · dd883716
Commit dd883716 authored Sep 01, 2020 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

changelogs/unreleased/security-websocket-extensions-update-0-1-5.yml ...unreleased/security-websocket-extensions-update-0-1-5.yml +5 -0

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1197,7 +1197,7 @@ GEM
      railties (>= 3.2.0)
    websocket-driver (0.7.1)
      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
    wikicloth (0.8.1)
      builder
      expression_parser

--- a/changelogs/unreleased/security-websocket-extensions-update-0-1-5.yml
+++ b/changelogs/unreleased/security-websocket-extensions-update-0-1-5.yml
+---
+title: Update websocket-extensions gem to 0.1.5
+merge_request:
+author: Vitor Meireles De Sousa
+type: security