diff --git a/Gemfile b/Gemfile index cfd940f..41c54c0 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,8 @@ gem 'therubyracer', platforms: :ruby gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -gem 'turbolinks' +# Funky side-effects - so we better not use Turbolinks +#gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.2' diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d5d0bc3..d4fbf54 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,6 +13,5 @@ //= require jquery //= require jquery_ujs //= require fancybox -//= require turbolinks //= require twitter/bootstrap //= require_tree . diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 087453b..312513b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,7 +2,7 @@