diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-12 14:23:45 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-12 14:23:45 +0000 |
commit | 72f9c7eb41820aebdf13459dade3884ed783718b (patch) | |
tree | 9e5a887fd437fc9d79786ef1698f7516215adb84 | |
parent | d15c9ae37b29c561a68309e8d81558016ffdb261 (diff) | |
parent | 6f10ffb67968e1b7daabc972879618ee42d69936 (diff) | |
download | gitlab-ce-72f9c7eb41820aebdf13459dade3884ed783718b.tar.gz |
Merge branch 'rails5-update-gemfile' into 'master'
Upgrade whitequark/parser to 2.5.3.0
See merge request gitlab-org/gitlab-ce!22984
-rw-r--r-- | Gemfile.rails5.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 31f06121884..247ce6c254e 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -546,7 +546,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) |