From f700f6e3cf9b6b7a83f4eac077fa79e0c54332e1 Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Thu, 5 Jan 2017 18:59:34 +0000
Subject: [PATCH] Merge branch 'patch-turbolinks' into 'security'
Updated Turbolinks to patched version of turbolinks-classic
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2048
---
Gemfile | 3 +-
Gemfile.lock | 10 ++--
.../assets/javascripts/jquery.turbolinks.js | 49 +++++++++++++++++++
3 files changed, 53 insertions(+), 9 deletions(-)
create mode 100644 vendor/assets/javascripts/jquery.turbolinks.js
diff --git a/Gemfile b/Gemfile
index af5566595ed..a8141abafc2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 786a44fe0fa..bdd591e008a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -264,6 +264,8 @@ GEM
mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3)
gitlab-markup (1.5.1)
+ gitlab-turbolinks-classic (2.5.6)
+ coffee-rails
gitlab_omniauth-ldap (1.2.1)
net-ldap (~> 0.9)
omniauth (~> 1.0)
@@ -370,9 +372,6 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
- jquery-turbolinks (2.1.0)
- railties (>= 3.1.0)
- turbolinks
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.3)
@@ -782,8 +781,6 @@ GEM
truncato (0.7.8)
htmlentities (~> 4.3.1)
nokogiri (~> 1.6.1)
- turbolinks (2.5.3)
- coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
u2f (0.2.1)
@@ -893,6 +890,7 @@ DEPENDENCIES
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.5.1)
+ gitlab-turbolinks-classic (~> 2.5, >= 2.5.6)
gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.2)
@@ -911,7 +909,6 @@ DEPENDENCIES
jira-ruby (~> 1.1.2)
jquery-atwho-rails (~> 1.3.2)
jquery-rails (~> 4.1.0)
- jquery-turbolinks (~> 2.1.0)
jquery-ui-rails (~> 5.0.0)
json-schema (~> 2.6.2)
jwt
@@ -1010,7 +1007,6 @@ DEPENDENCIES
thin (~> 1.7.0)
timecop (~> 0.8.0)
truncato (~> 0.7.8)
- turbolinks (~> 2.5.0)
u2f (~> 0.2.1)
uglifier (~> 2.7.2)
underscore-rails (~> 1.8.0)
diff --git a/vendor/assets/javascripts/jquery.turbolinks.js b/vendor/assets/javascripts/jquery.turbolinks.js
new file mode 100644
index 00000000000..fd6e95e75d5
--- /dev/null
+++ b/vendor/assets/javascripts/jquery.turbolinks.js
@@ -0,0 +1,49 @@
+// Generated by CoffeeScript 1.7.1
+
+/*
+jQuery.Turbolinks ~ https://github.com/kossnocorp/jquery.turbolinks
+jQuery plugin for drop-in fix binded events problem caused by Turbolinks
+
+The MIT License
+Copyright (c) 2012-2013 Sasha Koss & Rico Sta. Cruz
+ */
+
+(function() {
+ var $, $document;
+
+ $ = window.jQuery || (typeof require === "function" ? require('jquery') : void 0);
+
+ $document = $(document);
+
+ $.turbo = {
+ version: '2.1.0',
+ isReady: false,
+ use: function(load, fetch) {
+ return $document.off('.turbo').on("" + load + ".turbo", this.onLoad).on("" + fetch + ".turbo", this.onFetch);
+ },
+ addCallback: function(callback) {
+ if ($.turbo.isReady) {
+ callback($);
+ }
+ return $document.on('turbo:ready', function() {
+ return callback($);
+ });
+ },
+ onLoad: function() {
+ $.turbo.isReady = true;
+ return $document.trigger('turbo:ready');
+ },
+ onFetch: function() {
+ return $.turbo.isReady = false;
+ },
+ register: function() {
+ $(this.onLoad);
+ return $.fn.ready = this.addCallback;
+ }
+ };
+
+ $.turbo.register();
+
+ $.turbo.use('page:load', 'page:fetch');
+
+}).call(this);
--
GitLab