diff --git a/Gemfile b/Gemfile index 0258169..abc1d54 100644 --- 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 index 0d9b018..2e1c766 100644 --- 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 index 0e5cabb..563a5af 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,8 +5,8 @@ - <%= 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 %>