Merge branch 'master' into remove-machinist

Gemfile

@@ -26,11 +26,11 @@ gem 'aws-sdk-rails'
 gem 'rack-cors'
 
 gem 'haml-rails'
-gem 'sass-rails', '~> 4'
+gem 'sass-rails'
 gem 'uglifier'
 gem 'coffee-rails'
 gem 'bootstrap-sass'
-gem 'jquery-datatables-rails', '~> 1' # TODO: upgrade this to the present
+gem 'jquery-datatables-rails'
 
 group :development do
   gem 'better_errors' # Provides a better error page for Rails and other Rack apps

Gemfile.lock

@@ -140,7 +140,6 @@ GEM
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     hashie (3.6.0)
-    hike (1.2.3)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
@@ -153,8 +152,11 @@ GEM
     jbuilder (2.9.1)
       activesupport (>= 4.2.0)
     jmespath (1.4.0)
-    jquery-datatables-rails (1.12.2)
+    jquery-datatables-rails (3.4.0)
+      actionpack (>= 3.1)
       jquery-rails
+      railties (>= 3.1)
+      sass-rails
     jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -264,6 +266,9 @@ GEM
       thor (>= 0.18.1, < 2.0)
     raindrops (0.19.0)
     rake (12.3.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     redcarpet (3.4.0)
     ref (2.0.0)
     regexp_parser (1.5.1)
@@ -289,12 +294,17 @@ GEM
     ruby_parser (3.13.1)
       sexp_processor (~> 4.9)
     rubyzip (1.2.3)
-    sass (3.2.19)
-    sass-rails (4.0.5)
-      railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 3.0)
-      sprockets-rails (~> 2.0)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     sassc (2.0.1)
       ffi (~> 1.9)
       rake
@@ -304,15 +314,13 @@ GEM
     sexp_processor (4.12.0)
     shoulda-matchers (4.0.1)
       activesupport (>= 4.2.0)
-    sprockets (2.12.5)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     stripe (3.31.1)
       faraday (~> 0.10)
     stripe-ruby-mock (2.5.7)
@@ -332,7 +340,7 @@ GEM
       rack (>= 1, < 3)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (1.4.1)
+    tilt (2.0.9)
     timecop (0.9.1)
     turbolinks (5.2.0)
       turbolinks-source (~> 5.2)
@@ -371,7 +379,7 @@ DEPENDENCIES
   haml-rails
   html2haml
   jbuilder
-  jquery-datatables-rails (~> 1)
+  jquery-datatables-rails
   jquery-rails
   kaminari
   launchy
@@ -393,7 +401,7 @@ DEPENDENCIES
   redcarpet
   rspec-collection_matchers
   rspec-rails
-  sass-rails (~> 4)
+  sass-rails
   selenium-webdriver
   shoulda-matchers
   state_machine!

app/assets/javascripts/application.js

@@ -12,23 +12,23 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require bootstrap
 //= require dataTables/jquery.dataTables
-//= require dataTables/jquery.dataTables.bootstrap
+//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+//= require bootstrap
 
 $(document).ready(function () {
   $.extend( $.fn.dataTable.defaults, {
     "bPaginate": false
   } );
 
-  $('.js-datatable').dataTable({
+  $('.js-datatable').DataTable({
   });
 
-  $('.js-datatable-dues').dataTable({
+  $('.js-datatable-dues').DataTable({
     "aaSorting": [[ 2, "asc" ]]
   })
 
-  $('.js-datatable-applications').dataTable({
+  $('.js-datatable-applications').DataTable({
     "aaSorting": [[ 1, "desc" ]],
     "aoColumnDefs": [
       {'aTargets': ['date'], 'sType': "date"}

app/assets/stylesheets/application.css.scss

@@ -18,7 +18,7 @@
  *= require static_index
  *= require members
  *= require utilities
- *= require dataTables/jquery.dataTables.bootstrap
+ *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
 */
 
 @import url(//fonts.googleapis.com/css?family=Open+Sans:300,600);

config/initializers/assets.rb

@@ -0,0 +1,4 @@
+filenames = (Dir['app/assets/javascripts/*'] + Dir['app/assets/stylesheets/*']).map do |filepath|
+  File.basename(filepath).gsub('.scss', '')
+end
+Rails.application.config.assets.precompile += filenames