summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-04-09 04:07:48 +0000
committerRobert Speicher <robert@gitlab.com>2016-04-09 04:07:48 +0000
commit955d027d17485924ea7c04228edbade3bc835660 (patch)
tree40a341e6cc19f804abfa434c97cc7564dc0cb598 /Gemfile
parent9e2032173ce2d1b41b08d38fc22b89b52de6a823 (diff)
parent5ff9d2a1821ef0413a349388bcdc0fab84a17086 (diff)
downloadgitlab-ce-955d027d17485924ea7c04228edbade3bc835660.tar.gz
Merge branch 'rs-update-rails' into 'master'
Bump rails to 4.2.6 See merge request !3424
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 46431158fb5..3f29df0d81d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
-gem 'rails', '4.2.5.2'
+gem 'rails', '4.2.6'
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Responders respond_to and respond_with