summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-04-23 12:05:17 +0000
committerRémy Coutable <remy@rymai.me>2019-04-23 12:05:17 +0000
commitd369d6924076547327b6d2200762b5cb40b57e31 (patch)
treed2b090d54f7a62092fa29a9df87de271ea67e76f /Gemfile
parentdcb23df2f0194ab264d57cdc0b7c8ff1cc9c0e99 (diff)
parent97cd3e8c5ac3f96169b9b82e78b90f54ca1fcb22 (diff)
downloadgitlab-ce-d369d6924076547327b6d2200762b5cb40b57e31.tar.gz
Merge branch 'upgrade-to-rails-5-1' into 'master'
Upgrade Rails to 5.1 See merge request gitlab-org/gitlab-ce!27480
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index ab81cd8be2e..25b7376f424 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '5.0.7.2'
+gem 'rails', '5.1.7'
# Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'
@@ -18,7 +18,7 @@ gem 'mysql2', '~> 0.4.10', group: :mysql
gem 'pg', '~> 1.1', group: :postgres
gem 'rugged', '~> 0.28'
-gem 'grape-path-helpers', '~> 1.0'
+gem 'grape-path-helpers', '~> 1.1'
gem 'faraday', '~> 0.12'