diff options
author | Robert Speicher <robert@gitlab.com> | 2018-04-16 17:51:14 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-04-16 17:51:14 +0300 |
commit | 6680b6beb41a44ae23317b73e782822d05b21997 (patch) | |
tree | 8535f4dd3c5f12e379981cf8cc3a7ff5150c5031 | |
parent | cf7a3da4ccb705866878014d88a366337ed86af4 (diff) | |
parent | 0089a452a61b964852c3170b884e7b6aa3dfdafe (diff) |
Merge branch 'sh-bump-parser-gem' into 'master'
Bump parser gem to 2.5.1.0 to remove warning in rspec
See merge request gitlab-org/gitlab-ce!18384
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c3716baa762..23b6c2423e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -590,7 +590,7 @@ GEM orm_adapter (0.5.0) os (0.9.6) parallel (1.12.1) - parser (2.5.0.5) + parser (2.5.1.0) ast (~> 2.4.0) parslet (1.5.0) blankslate (~> 2.0) |