Merge branch 'ce-to-ee-2018-10-25' into 'master'

CE upstream - 2018-10-25 17:21 UTC See merge request gitlab-org/gitlab-ee!8089

Merge branch 'ce-to-ee-2018-10-25' into 'master'
CE upstream - 2018-10-25 17:21 UTC See merge request gitlab-org/gitlab-ee!8089
81d27fd0 · 🤖 GitLab Bot 🤖 · e3110c1a · 363a9640 · 81d27fd0 · 81d27fd0
Commit 81d27fd0 authored Oct 25, 2018 by 🤖 GitLab Bot 🤖
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +1 -1

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

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -576,7 +576,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
@@ -580,7 +580,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)