diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-10-29 18:23:13 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-10-29 18:23:13 +0000 |
| commit | 54bb7ad49e52c19affd9646fe9dcb9b1a4609387 (patch) | |
| tree | 9400e50b5e64c4586b4c8f3e08f233f6dbd14b13 | |
| parent | 6e743299dd92737005a1e5de3bb96a0f7b128199 (diff) | |
| parent | 7fb30b4cc4994022e55460e6905996212859cfb6 (diff) | |
| download | gitlab-ce-54bb7ad49e52c19affd9646fe9dcb9b1a4609387.tar.gz | |
Merge branch 'sh-bump-whitequark-parser' into 'master'
Upgrade whitequark/parser to 2.5.3.0
See merge request gitlab-org/gitlab-ce!22652
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e533b564d15..72fd7d679d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -547,7 +547,7 @@ GEM orm_adapter (0.5.0) os (1.0.0) parallel (1.12.1) - parser (2.5.1.2) + parser (2.5.3.0) ast (~> 2.4.0) parslet (1.8.2) peek (1.0.1) |