Merge pull request #73 from elan71592/remove-turbolinks

remove turbolinks
elankvitko · Jun 6, 2016 · 6647d6c · 6647d6c
2 parents f8e2777 + 81be2e8
commit 6647d6c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -16,8 +16,7 @@ gem 'coffee-rails', '~> 4.1.0'
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
+
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,7 +14,6 @@
 //= require jquery_ujs
 //= require materialize-sprockets
 //= require materialize/extras/nouislider
-//= require turbolinks
 //= require react
 //= require react_ujs
 //= require components

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -5,8 +5,8 @@
       <!--Import Google Icon Font-->
       <link href="http://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 
-      <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-      <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+      <%= stylesheet_link_tag    'application', media: 'all' %>
+      <%= javascript_include_tag 'application' %>
       <%= csrf_meta_tags %>
 
       <!--Let browser know website is optimized for mobile-->