diff --git a/Gemfile b/Gemfile index 29c7a309..8383d7ea 100644 --- a/Gemfile +++ b/Gemfile @@ -10,6 +10,7 @@ gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 4.1.0' gem 'jquery-rails' gem 'turbolinks' +gem 'jquery-turbolinks' gem 'jbuilder', '~> 2.2.4' gem 'sdoc', '~> 0.4.1', group: :doc diff --git a/Gemfile.lock b/Gemfile.lock index cc11390b..bb8fd59b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,6 +69,9 @@ GEM jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks json (1.8.1) kgio (2.9.2) mail (2.6.1) @@ -166,6 +169,7 @@ DEPENDENCIES http_accept_language jbuilder (~> 2.2.4) jquery-rails + jquery-turbolinks mysql2 nprogress-rails pg diff --git a/app/assets/javascripts/application.js.erb.coffee b/app/assets/javascripts/application.js.erb.coffee index aaf33e75..e6b85dec 100644 --- a/app/assets/javascripts/application.js.erb.coffee +++ b/app/assets/javascripts/application.js.erb.coffee @@ -1,5 +1,6 @@ #= require jquery #= require jquery_ujs +#= require jquery.turbolinks #= require turbolinks #= require bootstrap #= require bootstrap-material-design