removed all traces of turbolinks and cleaned up Gemfile

bad6e · bad6e · commit 6a16ab060bdc · 2015-10-18T10:47:09.000-06:00
diff --git a/Gemfile b/Gemfile
@@ -1,61 +1,31 @@
-source 'https://rubygems.org'
-
-
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.4'
-# Use postgresql as the database for Active Record
-gem 'pg'
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
-# Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.1.0'
-# See https://github.com/rails/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
-
-# 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.
-gem 'sdoc', '~> 0.4.0', group: :doc
-
-# Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
-
-# Use Unicorn as the app server
-# gem 'unicorn'
-
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
-
-gem 'bootstrap-sass', '~> 3.3.5'
-
-gem 'bootswatch-rails'
-
-gem 'nokogiri'
-
-gem 'whenever', require: false
+source "https://rubygems.org"
+
+
+gem "rails", "4.2.4"
+gem "pg"
+gem "sass-rails", "~> 5.0"
+gem "uglifier", ">= 1.3.0"
+gem "coffee-rails", "~> 4.1.0"
+gem "jquery-rails"
+gem "jbuilder", "~> 2.0"
+gem "sdoc", "~> 0.4.0", group: :doc
+gem "bootstrap-sass", "~> 3.3.5"
+gem "bootswatch-rails"
+gem "nokogiri"
+gem "whenever", require: false
 
 group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug'
-  gem 'rspec-rails'
-  gem 'database_cleaner'
-  gem 'capybara'
-  gem 'launchy'
-  gem 'pry', :require => 'pry'
-  gem 'shoulda-matchers'
+  gem "byebug"
+  gem "rspec-rails"
+  gem "database_cleaner"
+  gem "capybara"
+  gem "launchy"
+  gem "pry", :require => "pry"
+  gem "shoulda-matchers"
 end
 
 group :development do
-  # Access an IRB console on exception pages or by using <%= console %> in views
-  gem 'web-console', '~> 2.0'
-
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  gem 'spring'
+  gem "web-console", "~> 2.0"
+  gem "spring"
 end
 
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -2,8 +2,8 @@
 <html>
 <head>
   <title>Gitcommit</title>
-  <%= 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 %>
 </head>
 <body>
