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

Upgrade parser gem to 2.5.1.2 See merge request gitlab-org/gitlab-ce!22590

Merge branch 'sh-update-parser' into 'master'
Upgrade parser gem to 2.5.1.2 See merge request gitlab-org/gitlab-ce!22590
c2a8cd05 · Robert Speicher · 4de90041 · 4453adb5 · c2a8cd05 · c2a8cd05
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

Gemfile.lock Gemfile.lock +1 -1

Gemfile.rails5.lock Gemfile.rails5.lock +1 -1

未找到文件。
--- 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.0)
+    parser (2.5.1.2)
      ast (~> 2.4.0)
    parslet (1.8.2)
    peek (1.0.1)

--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -551,7 +551,7 @@ GEM
    orm_adapter (0.5.0)
    os (1.0.0)
    parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.1.2)
      ast (~> 2.4.0)
    parslet (1.8.2)
    peek (1.0.1)