summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-02 15:10:54 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-02 15:10:54 +0000
commit8e3523281051490ff696bfd85bea1195c046c87c (patch)
treee44c77aa24136950679151ae70ad6e186987602a /Gemfile.lock
parente2d4c85dec083d517822e3a21165cd373b162d9b (diff)
downloadgitlab-ce-8e3523281051490ff696bfd85bea1195c046c87c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ae678d2321b..53ede64312b 100644
--- 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