Merge remote-tracking branch 'origin/master' into 0.17.x

Author: Daniel O'Connor

app/views/home/_assets_menu.html.haml

@@ -3,5 +3,5 @@
     trigger   : "#asset",
     fade      : 500,
     appear    : 500,
-    menu_items: [ #{sort_by_assets.join(",")} ]
+    menu_items: [ #{raw sort_by_assets.join(",")} ]
   });

db/migrate/20180102075234_add_account_counter_caches.rb

@@ -14,7 +14,8 @@ def change
 
   def data
     Account.all.each do |account|
-      account.update_columns(
+      Account.update_counters(
+        account.id,
         contacts_count: account.contacts.count,
         opportunities_count: account.opportunities.count
       )

spec/views/home/options.js.haml_spec.rb

@@ -24,7 +24,7 @@
     render
 
     expect(rendered).to include("$('#options').html")
-    expect(rendered).to include("$('#asset').html('campaign')")
+    expect(rendered).to include("$(\\\'#asset\\\').html(\\\'campaign\\\')")
     expect(rendered).to include("crm.flip_form('options')")
     expect(rendered).to include("crm.set_title('title', 'Recent Activity Options')")
   end