From 10ba7901243b5af5a1c8bab3a4c2ce08eecb65c9 Mon Sep 17 00:00:00 2001
From: Sam Stephenson <sam@37signals.com>
Date: Thu, 30 Jun 2016 12:18:52 -0500
Subject: [PATCH] Update to Turbolinks 5.0.0 final

---
 Gemfile                                   |  2 +-
 Gemfile.lock                              | 13 ++++---------
 railties/lib/rails/generators/app_base.rb |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5650147099..0b3ba1a2e1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'mocha', '~> 0.14', require: false
 gem 'rack-cache', '~> 1.2'
 gem 'jquery-rails'
 gem 'coffee-rails', github: 'rails/coffee-rails'
-gem 'turbolinks', github: 'turbolinks/turbolinks-rails'
+gem 'turbolinks', '~> 5'
 
 # require: false so bcrypt is loaded only when has_secure_password is used.
 # This is to avoid Active Model (and by extension the entire framework)
diff --git a/Gemfile.lock b/Gemfile.lock
index 71f4302a5b..ae0608f5d1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,13 +36,6 @@ GIT
   specs:
     sass (3.4.22)
 
-GIT
-  remote: git://github.com/turbolinks/turbolinks-rails.git
-  revision: 65884729016dbb4d032f12bb01b7e7c1ddeb68ac
-  specs:
-    turbolinks (5.0.0.beta2)
-      turbolinks-source
-
 PATH
   remote: .
   specs:
@@ -321,7 +314,9 @@ GEM
     thor (0.19.1)
     thread (0.1.7)
     thread_safe (0.3.5)
-    turbolinks-source (5.0.0.beta4)
+    turbolinks (5.0.0)
+      turbolinks-source (~> 5)
+    turbolinks-source (5.0.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     tzinfo-data (1.2016.4)
@@ -392,7 +387,7 @@ DEPENDENCIES
   sqlite3 (~> 1.3.6)
   stackprof
   sucker_punch
-  turbolinks!
+  turbolinks (~> 5)
   tzinfo-data
   uglifier (>= 1.3.0)
   w3c_validators
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index f0a3289563..62989be74f 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -324,7 +324,7 @@ module Rails
                                        "Use #{options[:javascript]} as the JavaScript library")
 
           unless options[:skip_turbolinks]
-            gems << GemfileEntry.version("turbolinks", "~> 5.x",
+            gems << GemfileEntry.version("turbolinks", "~> 5",
              "Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks")
           end