summaryrefslogtreecommitdiff
path: root/Gemfile.rails5.lock
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2018-04-07 12:03:42 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2018-04-07 12:03:42 +1100
commit585b7acc5b26d5bb98e4e1567b2d0ed36d81b7ac (patch)
treee1be82d7587f391c20df96a6d071d7a88a397277 /Gemfile.rails5.lock
parentaade8b3652573db40e7b777c72caa922b0bc12ef (diff)
downloadgitlab-ce-585b7acc5b26d5bb98e4e1567b2d0ed36d81b7ac.tar.gz
Bump `parser` gem to 2.5.0.5blackst0ne-bump-parser-2-5-0-5
1. Synchronize used version of `parser` gem for both versions of rails: 4 and 5. 2. Fix broken CI pipelines for rails5 branches. The 2.5.0.4 version is removed from rubygems, so it's skipped. https://github.com/whitequark/parser/issues/478
Diffstat (limited to 'Gemfile.rails5.lock')
-rw-r--r--Gemfile.rails5.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index 08ae3fb514c..18bbad88ec3 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -291,7 +291,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
- gitaly-proto (0.91.0)
+ gitaly-proto (0.94.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (5.3.3)
@@ -587,7 +587,7 @@ GEM
orm_adapter (0.5.0)
os (0.9.6)
parallel (1.12.1)
- parser (2.5.0.4)
+ parser (2.5.0.5)
ast (~> 2.4.0)
parslet (1.5.0)
blankslate (~> 2.0)
@@ -1062,7 +1062,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly-proto (~> 0.91.0)
+ gitaly-proto (~> 0.94.0)
github-linguist (~> 5.3.3)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2)