diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-01-05 18:59:34 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-01-10 19:41:52 -0500 |
| commit | f700f6e3cf9b6b7a83f4eac077fa79e0c54332e1 (patch) | |
| tree | 60249f783fee1f226809f21d6fb7562d4b09ad69 /Gemfile | |
| parent | 590e3d6461878ab64fbcfa51cad8e55f95f1c09c (diff) | |
| download | gitlab-ce-f700f6e3cf9b6b7a83f4eac077fa79e0c54332e1.tar.gz | |
Merge branch 'patch-turbolinks' into 'security'
Updated Turbolinks to patched version of turbolinks-classic
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2048
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -221,8 +221,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' |