Merge corrections provided by Bambuch

app/controllers/default/units_controller.rb

@@ -12,7 +12,7 @@ class Default::UnitsController < ApplicationController
   end
 
   def index
-    @units = current_user.units.defaults_diff.includes(:base).includes(:subunits).ordered
+    @units = current_user.units.defaults_diff.includes(:base, :subunits).ordered
   end
 
   def import

app/controllers/measurements_controller.rb

@@ -21,10 +21,10 @@ class MeasurementsController < ApplicationController
     quantities -= @prev_quantities
     @readouts = current_user.readouts.build(quantities.map { |q| {quantity: q} })
 
-    all_quantities = @prev_qantities + quantities
+    all_quantities = @prev_quantities + quantities
     @closest_ancestor = current_user.quantities
       .common_ancestors(all_quantities.map(&:parent_id)).first
-    all_quantites << @closest_ancestor if @closest_ancestor
+    all_quantities << @closest_ancestor if @closest_ancestor
 
     @units = current_user.units.ordered
   end

app/controllers/quantities_controller.rb

@@ -9,7 +9,7 @@ class QuantitiesController < ApplicationController
   end
 
   def index
-    @quantities = current_user.quantities.ordered.includes(:parent).includes(:subquantities)
+    @quantities = current_user.quantities.ordered.includes(:parent, :subquantities)
   end
 
   def new

app/controllers/units_controller.rb

@@ -9,7 +9,7 @@ class UnitsController < ApplicationController
   end
 
   def index
-    @units = current_user.units.ordered.includes(:base).includes(:subunits)
+    @units = current_user.units.ordered.includes(:base, :subunits)
   end
 
   def new

app/controllers/users_controller.rb

@@ -26,6 +26,7 @@ class UsersController < ApplicationController
     raise ParameterInvalid unless allow_disguise?(@user)
     session[:revert_to_id] = current_user.id
     bypass_sign_in(@user)
+    # TODO: add flash with disguised username?
     redirect_to root_url
   end