Commit c2a8cd05 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'sh-update-parser' into 'master'

Upgrade parser gem to 2.5.1.2

See merge request gitlab-org/gitlab-ce!22590
parents 4de90041 4453adb5
...@@ -547,7 +547,7 @@ GEM ...@@ -547,7 +547,7 @@ GEM
orm_adapter (0.5.0) orm_adapter (0.5.0)
os (1.0.0) os (1.0.0)
parallel (1.12.1) parallel (1.12.1)
parser (2.5.1.0) parser (2.5.1.2)
ast (~> 2.4.0) ast (~> 2.4.0)
parslet (1.8.2) parslet (1.8.2)
peek (1.0.1) peek (1.0.1)
......
...@@ -551,7 +551,7 @@ GEM ...@@ -551,7 +551,7 @@ GEM
orm_adapter (0.5.0) orm_adapter (0.5.0)
os (1.0.0) os (1.0.0)
parallel (1.12.1) parallel (1.12.1)
parser (2.5.1.0) parser (2.5.1.2)
ast (~> 2.4.0) ast (~> 2.4.0)
parslet (1.8.2) parslet (1.8.2)
peek (1.0.1) peek (1.0.1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment