summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-01-05 18:59:34 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2017-01-09 16:07:16 -0500
commite51acb0566006e9374ff59686553381c6ec52820 (patch)
tree7166ac31c3d81d082fe19f0c96c2e8a88690a9b8 /Gemfile
parentb13543f469586d6b7e0b53aa92478c048e63edbd (diff)
downloadgitlab-ce-e51acb0566006e9374ff59686553381c6ec52820.tar.gz
Merge branch 'patch-turbolinks' into 'security'
Updated Turbolinks to patched version of turbolinks-classic See merge request !2048
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 570eaacbcf7..8c695f1a467 100644
--- a/Gemfile
+++ b/Gemfile
@@ -218,8 +218,7 @@ gem 'chronic_duration', '~> 0.10.6'
gem 'sass-rails', '~> 5.0.6'
gem 'coffee-rails', '~> 4.1.0'
gem 'uglifier', '~> 2.7.2'
-gem 'turbolinks', '~> 2.5.0'
-gem 'jquery-turbolinks', '~> 2.1.0'
+gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6'
gem 'addressable', '~> 2.3.8'
gem 'bootstrap-sass', '~> 3.3.0'