Merge pull request #25607 from sstephenson/turbolinks-5-final

Update to Turbolinks 5.0.0 final

Gemfile

@@ -12,7 +12,7 @@ gem 'mocha', '~> 0.14', require: false
 gem 'rack-cache', '~> 1.2'
 gem 'jquery-rails'
 gem 'coffee-rails', '~> 4.2'
-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)

Gemfile.lock

@@ -26,13 +26,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:
@@ -258,7 +251,9 @@ GEM
     thor (0.19.1)
     thread (0.1.7)
     thread_safe (0.3.5)
-    turbolinks-source (5.0.0.beta5)
+    turbolinks (5.0.0)
+      turbolinks-source (~> 5)
+    turbolinks-source (5.0.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     tzinfo-data (1.2016.5)
@@ -325,7 +320,7 @@ DEPENDENCIES
   sqlite3 (~> 1.3.6)
   stackprof
   sucker_punch
-  turbolinks!
+  turbolinks (~> 5)
   tzinfo-data
   uglifier (>= 1.3.0)
   w3c_validators

railties/lib/rails/generators/app_base.rb

@@ -324,7 +324,7 @@ def javascript_gemfile_entry
                                        "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